Skip to content

Commit 823b818

Browse files
authored
Make rust_tools_util package compatible with current stable by lowering rust edition to 2021. (#14211)
Between the release of v0.4.0 and v0.4.1 the edition was pushed to 2024 by a4805ff changelog: Use edition=2021 in `rustc_tools_util`
2 parents 50ecb6e + f7f7888 commit 823b818

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ path = "src/driver.rs"
2525
[dependencies]
2626
clippy_config = { path = "clippy_config" }
2727
clippy_lints = { path = "clippy_lints" }
28-
rustc_tools_util = { path = "rustc_tools_util", version = "0.4.1" }
28+
rustc_tools_util = { path = "rustc_tools_util", version = "0.4.2" }
2929
tempfile = { version = "3.3", optional = true }
3030
termize = "0.1"
3131
color-print = "0.3.4"
@@ -54,7 +54,7 @@ parking_lot = "0.12"
5454
tokio = { version = "1", features = ["io-util"] }
5555

5656
[build-dependencies]
57-
rustc_tools_util = { path = "rustc_tools_util", version = "0.4.1" }
57+
rustc_tools_util = { path = "rustc_tools_util", version = "0.4.2" }
5858

5959
[features]
6060
integration = ["tempfile"]

rustc_tools_util/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[package]
22
name = "rustc_tools_util"
3-
version = "0.4.1"
3+
version = "0.4.2"
44
description = "small helper to generate version information for git packages"
55
repository = "https://github.com/rust-lang/rust-clippy"
66
readme = "README.md"
77
license = "MIT OR Apache-2.0"
88
keywords = ["rustc", "tool", "git", "version", "hash"]
99
categories = ["development-tools"]
10-
edition = "2024"
10+
edition = "2021" # Keep this, for this crate's MSRV to stay low
1111

1212
[dependencies]

rustc_tools_util/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ build = "build.rs"
1313
List rustc_tools_util as regular AND build dependency.
1414
````toml
1515
[dependencies]
16-
rustc_tools_util = "0.4.1"
16+
rustc_tools_util = "0.4.2"
1717

1818
[build-dependencies]
19-
rustc_tools_util = "0.4.1"
19+
rustc_tools_util = "0.4.2"
2020
````
2121

2222
In `build.rs`, generate the data in your `main()`

rustc_tools_util/src/lib.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ mod test {
188188
let vi = get_version_info!();
189189
assert_eq!(vi.major, 0);
190190
assert_eq!(vi.minor, 4);
191-
assert_eq!(vi.patch, 1);
191+
assert_eq!(vi.patch, 2);
192192
assert_eq!(vi.crate_name, "rustc_tools_util");
193193
// hard to make positive tests for these since they will always change
194194
assert!(vi.commit_hash.is_none());
@@ -200,7 +200,7 @@ mod test {
200200
#[test]
201201
fn test_display_local() {
202202
let vi = get_version_info!();
203-
assert_eq!(vi.to_string(), "rustc_tools_util 0.4.1");
203+
assert_eq!(vi.to_string(), "rustc_tools_util 0.4.2");
204204
}
205205

206206
#[test]
@@ -209,7 +209,7 @@ mod test {
209209
let s = format!("{vi:?}");
210210
assert_eq!(
211211
s,
212-
"VersionInfo { crate_name: \"rustc_tools_util\", major: 0, minor: 4, patch: 1 }"
212+
"VersionInfo { crate_name: \"rustc_tools_util\", major: 0, minor: 4, patch: 2 }"
213213
);
214214
}
215215
}

0 commit comments

Comments
 (0)