From 653f2ccfe24221f3678c9c758342bfde06611ded Mon Sep 17 00:00:00 2001 From: msrd0 Date: Fri, 8 Sep 2023 12:30:05 +0200 Subject: [PATCH] Bump MSRV and Rust version used in CI (#129) --- .github/workflows/rust.yml | 8 +++++--- README.j2 | 4 ++-- README.md | 6 +++--- influxdb/src/client/mod.rs | 2 +- influxdb/src/query/line_proto_term.rs | 10 +++++----- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 494d437..b56b977 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@1.63.0 + - uses: dtolnay/rust-toolchain@1.72.0 with: components: clippy - name: Check Clippy lints (reqwest) @@ -54,7 +54,7 @@ jobs: matrix: rust: - name: MSRV - toolchain: "1.60" + toolchain: "1.63" nightly: false - name: Stable toolchain: stable @@ -123,7 +123,9 @@ jobs: DOCKER_INFLUXDB_INIT_ADMIN_TOKEN: admintoken steps: - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@stable + - uses: dtolnay/rust-toolchain@master + with: + toolchain: ${{matrix.rust.toolchain}} id: rust-toolchain - uses: actions/cache@v3 with: diff --git a/README.j2 b/README.j2 index ff9a594..7e66167 100644 --- a/README.j2 +++ b/README.j2 @@ -25,8 +25,8 @@ Build with Rust - - Minimum Rust Version: 1.60 + + Minimum Rust Version: 1.63

diff --git a/README.md b/README.md index e960bdd..9b2ee24 100644 --- a/README.md +++ b/README.md @@ -25,8 +25,8 @@ Build with Rust - - Minimum Rust Version: 1.60 + + Minimum Rust Version: 1.63

@@ -167,7 +167,7 @@ To communicate with InfluxDB, you can choose the HTTP backend to be used configu @ 2020 Gero Gerke and [contributors]. [contributors]: https://github.com/influxdb-rs/influxdb-rust/graphs/contributors - [__cargo_doc2readme_dependencies_info]: ggGkYW0BYXSEG-eS3ZnLalPKG8RSyE7OgxOuG5N_7FO9S6I9G5Bq0rFyX93cYXKEG5PjkhkfWGqnG0oaNZtY0rqCG3UxTXMZvJknG2Qnb8mp1lIsYWSBgmhpbmZsdXhkYmUwLjcuMA + [__cargo_doc2readme_dependencies_info]: ggGkYW0BYXSEG64av5CnNoNoGw8lPMr2b0MoG44uU0T70vGSG7osgcbjN7SoYXKEG5PjkhkfWGqnG0oaNZtY0rqCG3UxTXMZvJknG2Qnb8mp1lIsYWSBgmhpbmZsdXhkYmUwLjcuMA [__link0]: https://github.com/influxdb-rs/influxdb-rust/blob/main/CONTRIBUTING.md [__link1]: https://github.com/influxdb-rs/influxdb-rust/blob/main/CODE_OF_CONDUCT.md [__link10]: https://curl.se/libcurl/ diff --git a/influxdb/src/client/mod.rs b/influxdb/src/client/mod.rs index 55e0761..ad198bc 100644 --- a/influxdb/src/client/mod.rs +++ b/influxdb/src/client/mod.rs @@ -50,7 +50,7 @@ impl<'a> Debug for RedactPassword<'a> { _ => (*k, v.as_str()), }) .collect::>(); - f.debug_map().entries(entries.into_iter()).finish() + f.debug_map().entries(entries).finish() } } diff --git a/influxdb/src/query/line_proto_term.rs b/influxdb/src/query/line_proto_term.rs index 422ef7a..77d159c 100644 --- a/influxdb/src/query/line_proto_term.rs +++ b/influxdb/src/query/line_proto_term.rs @@ -83,7 +83,7 @@ impl LineProtoTerm<'_> { } fn escape_any(s: &str, re: &Regex) -> String { - re.replace_all(s, r#"\$0"#).to_string() + re.replace_all(s, r"\$0").to_string() } } @@ -101,11 +101,11 @@ mod test { assert_eq!( TagValue(&Type::Text("this is my special string".into())).escape(), - r#"this\ is\ my\ special\ string"# + r"this\ is\ my\ special\ string" ); assert_eq!( TagValue(&Type::Text("a tag w=i th == tons of escapes".into())).escape(), - r#"a\ tag\ w\=i\ th\ \=\=\ tons\ of\ escapes"# + r"a\ tag\ w\=i\ th\ \=\=\ tons\ of\ escapes" ); assert_eq!( TagValue(&Type::Text("no_escapes".into())).escape(), @@ -113,11 +113,11 @@ mod test { ); assert_eq!( TagValue(&Type::Text("some,commas,here".into())).escape(), - r#"some\,commas\,here"# + r"some\,commas\,here" ); assert_eq!(Measurement(r#"wea", ther"#).escape(), r#"wea"\,\ ther"#); - assert_eq!(TagKey(r#"locat\ ,=ion"#).escape(), r#"locat\\ \,\=ion"#); + assert_eq!(TagKey(r"locat\ ,=ion").escape(), r"locat\\ \,\=ion"); assert_eq!(FieldValue(&Type::Boolean(true)).escape(), r#"true"#); assert_eq!(FieldValue(&Type::Boolean(false)).escape(), r#"false"#);