Skip to content

Commit 653f2cc

Browse files
authored
Bump MSRV and Rust version used in CI (#129)
1 parent 065c201 commit 653f2cc

File tree

5 files changed

+16
-14
lines changed

5 files changed

+16
-14
lines changed

.github/workflows/rust.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ubuntu-latest
2525
steps:
2626
- uses: actions/checkout@v3
27-
- uses: dtolnay/rust-toolchain@1.63.0
27+
- uses: dtolnay/rust-toolchain@1.72.0
2828
with:
2929
components: clippy
3030
- name: Check Clippy lints (reqwest)
@@ -54,7 +54,7 @@ jobs:
5454
matrix:
5555
rust:
5656
- name: MSRV
57-
toolchain: "1.60"
57+
toolchain: "1.63"
5858
nightly: false
5959
- name: Stable
6060
toolchain: stable
@@ -123,7 +123,9 @@ jobs:
123123
DOCKER_INFLUXDB_INIT_ADMIN_TOKEN: admintoken
124124
steps:
125125
- uses: actions/checkout@v3
126-
- uses: dtolnay/rust-toolchain@stable
126+
- uses: dtolnay/rust-toolchain@master
127+
with:
128+
toolchain: ${{matrix.rust.toolchain}}
127129
id: rust-toolchain
128130
- uses: actions/cache@v3
129131
with:

README.j2

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
<a href="https://www.rust-lang.org/en-US/">
2626
<img src="https://img.shields.io/badge/Made%20with-Rust-orange.svg" alt='Build with Rust' />
2727
</a>
28-
<a href="https://blog.rust-lang.org/2022/04/07/Rust-1.60.0.html">
29-
<img src="https://img.shields.io/badge/rustc-1.60+-yellow.svg" alt='Minimum Rust Version: 1.60' />
28+
<a href="https://blog.rust-lang.org/2022/08/11/Rust-1.63.0.html">
29+
<img src="https://img.shields.io/badge/rustc-1.63+-yellow.svg" alt='Minimum Rust Version: 1.63' />
3030
</a>
3131
</p>
3232

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
<a href="https://www.rust-lang.org/en-US/">
2626
<img src="https://img.shields.io/badge/Made%20with-Rust-orange.svg" alt='Build with Rust' />
2727
</a>
28-
<a href="https://blog.rust-lang.org/2022/04/07/Rust-1.60.0.html">
29-
<img src="https://img.shields.io/badge/rustc-1.60+-yellow.svg" alt='Minimum Rust Version: 1.60' />
28+
<a href="https://blog.rust-lang.org/2022/08/11/Rust-1.63.0.html">
29+
<img src="https://img.shields.io/badge/rustc-1.63+-yellow.svg" alt='Minimum Rust Version: 1.63' />
3030
</a>
3131
</p>
3232

@@ -167,7 +167,7 @@ To communicate with InfluxDB, you can choose the HTTP backend to be used configu
167167
@ 2020 Gero Gerke and [contributors].
168168

169169
[contributors]: https://github.com/influxdb-rs/influxdb-rust/graphs/contributors
170-
[__cargo_doc2readme_dependencies_info]: ggGkYW0BYXSEG-eS3ZnLalPKG8RSyE7OgxOuG5N_7FO9S6I9G5Bq0rFyX93cYXKEG5PjkhkfWGqnG0oaNZtY0rqCG3UxTXMZvJknG2Qnb8mp1lIsYWSBgmhpbmZsdXhkYmUwLjcuMA
170+
[__cargo_doc2readme_dependencies_info]: ggGkYW0BYXSEG64av5CnNoNoGw8lPMr2b0MoG44uU0T70vGSG7osgcbjN7SoYXKEG5PjkhkfWGqnG0oaNZtY0rqCG3UxTXMZvJknG2Qnb8mp1lIsYWSBgmhpbmZsdXhkYmUwLjcuMA
171171
[__link0]: https://github.com/influxdb-rs/influxdb-rust/blob/main/CONTRIBUTING.md
172172
[__link1]: https://github.com/influxdb-rs/influxdb-rust/blob/main/CODE_OF_CONDUCT.md
173173
[__link10]: https://curl.se/libcurl/

influxdb/src/client/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ impl<'a> Debug for RedactPassword<'a> {
5050
_ => (*k, v.as_str()),
5151
})
5252
.collect::<BTreeMap<&'static str, &str>>();
53-
f.debug_map().entries(entries.into_iter()).finish()
53+
f.debug_map().entries(entries).finish()
5454
}
5555
}
5656

influxdb/src/query/line_proto_term.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ impl LineProtoTerm<'_> {
8383
}
8484

8585
fn escape_any(s: &str, re: &Regex) -> String {
86-
re.replace_all(s, r#"\$0"#).to_string()
86+
re.replace_all(s, r"\$0").to_string()
8787
}
8888
}
8989

@@ -101,23 +101,23 @@ mod test {
101101

102102
assert_eq!(
103103
TagValue(&Type::Text("this is my special string".into())).escape(),
104-
r#"this\ is\ my\ special\ string"#
104+
r"this\ is\ my\ special\ string"
105105
);
106106
assert_eq!(
107107
TagValue(&Type::Text("a tag w=i th == tons of escapes".into())).escape(),
108-
r#"a\ tag\ w\=i\ th\ \=\=\ tons\ of\ escapes"#
108+
r"a\ tag\ w\=i\ th\ \=\=\ tons\ of\ escapes"
109109
);
110110
assert_eq!(
111111
TagValue(&Type::Text("no_escapes".into())).escape(),
112112
r#"no_escapes"#
113113
);
114114
assert_eq!(
115115
TagValue(&Type::Text("some,commas,here".into())).escape(),
116-
r#"some\,commas\,here"#
116+
r"some\,commas\,here"
117117
);
118118

119119
assert_eq!(Measurement(r#"wea", ther"#).escape(), r#"wea"\,\ ther"#);
120-
assert_eq!(TagKey(r#"locat\ ,=ion"#).escape(), r#"locat\\ \,\=ion"#);
120+
assert_eq!(TagKey(r"locat\ ,=ion").escape(), r"locat\\ \,\=ion");
121121

122122
assert_eq!(FieldValue(&Type::Boolean(true)).escape(), r#"true"#);
123123
assert_eq!(FieldValue(&Type::Boolean(false)).escape(), r#"false"#);

0 commit comments

Comments
 (0)