Skip to content

Commit 5d5286c

Browse files
authored
Update MSRV in MODULE.bazel as well as WORKSPACE.bazel (#3353)
Since our testing mostly uses bzlmod these days, we've currently regressed in this coverage.
1 parent 0fee1ee commit 5d5286c

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

.bazelci/presubmit.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ aspects_flags: &aspects_flags
1717
- "--config=rustfmt"
1818
- "--config=clippy"
1919
min_rust_version_shell_commands: &min_rust_version_shell_commands
20-
- sed -i 's|^rust_register_toolchains(|rust_register_toolchains(versions = ["1.72.1"],\n|' WORKSPACE.bazel
20+
- sed -i 's|^rust_register_toolchains(|rust_register_toolchains(versions = ["1.74.0"],\n|' WORKSPACE.bazel
21+
- sed -i 's|^rust\.toolchain(|rust.toolchain(versions = ["1.74.0"],\n|' MODULE.bazel
2122
nightly_flags: &nightly_flags
2223
- "--//rust/toolchain/channel=nightly"
2324
nightly_aspects_flags: &nightly_aspects_flags
@@ -377,6 +378,7 @@ tasks:
377378
# Test rules while only registering a nightly toolchain
378379
shell_commands:
379380
- sed -i 's|^rust_register_toolchains(|load("//rust/private:common.bzl", "DEFAULT_RUST_VERSION")\nrust_register_toolchains(versions = [DEFAULT_RUST_VERSION],\n|' WORKSPACE.bazel
381+
- sed -i 's|^rust\.toolchain(|rust.toolchain(versions = ['$(awk '$0 ~ /^DEFAULT_RUST_VERSION = / {print $3}' rust/private/common.bzl)'],\n|' MODULE.bazel
380382
build_targets: *single_rust_channel_targets
381383
test_targets: *single_rust_channel_targets
382384
ubuntu2004_stable_with_aspects:
@@ -385,6 +387,7 @@ tasks:
385387
# Test rules while only registering a nightly toolchain
386388
shell_commands:
387389
- sed -i 's|^rust_register_toolchains(|load("//rust/private:common.bzl", "DEFAULT_RUST_VERSION")\nrust_register_toolchains(versions = [DEFAULT_RUST_VERSION],\n|' WORKSPACE.bazel
390+
- sed -i 's|^rust\.toolchain(|rust.toolchain(versions = ['$(awk '$0 ~ /^DEFAULT_RUST_VERSION = / {print $3}' rust/private/common.bzl)'],\n|' MODULE.bazel
388391
build_flags: *aspects_flags
389392
build_targets: *single_rust_channel_targets
390393
test_flags: *aspects_flags
@@ -395,6 +398,7 @@ tasks:
395398
# Test rules while only registering a nightly toolchain
396399
shell_commands:
397400
- sed -i 's|^rust_register_toolchains(|load("//rust/private:common.bzl", "DEFAULT_NIGHTLY_ISO_DATE")\nrust_register_toolchains(versions = ["nightly/" + DEFAULT_NIGHTLY_ISO_DATE],\n|' WORKSPACE.bazel
401+
- sed -i 's|^rust\.toolchain(|rust.toolchain(versions = ["nightly/'$(awk -F '"' '$0 ~ /^DEFAULT_NIGHTLY_ISO_DATE = / {print $2}' rust/private/common.bzl)'"],\n|' MODULE.bazel
398402
build_flags: *nightly_flags
399403
build_targets: *single_rust_channel_targets
400404
test_flags: *nightly_flags
@@ -405,6 +409,7 @@ tasks:
405409
# Test rules while only registering a nightly toolchain
406410
shell_commands:
407411
- sed -i 's|^rust_register_toolchains(|load("//rust/private:common.bzl", "DEFAULT_NIGHTLY_ISO_DATE")\nrust_register_toolchains(versions = ["nightly/" + DEFAULT_NIGHTLY_ISO_DATE],\n|' WORKSPACE.bazel
412+
- sed -i 's|^rust\.toolchain(|rust.toolchain(versions = ["nightly/'$(awk -F '"' '$0 ~ /^DEFAULT_NIGHTLY_ISO_DATE = / {print $2}' rust/private/common.bzl)'"],\n|' MODULE.bazel
408413
build_flags: *nightly_aspects_flags
409414
build_targets: *single_rust_channel_targets
410415
test_flags: *nightly_aspects_flags

cargo/cargo_build_script_runner/cargo_manifest_dir.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ mod tests {
382382
let out_dir = test_tmp.join("out_dir");
383383
fs::create_dir(&out_dir).unwrap();
384384
let nested_dir = out_dir.join("nested");
385-
fs::create_dir(&nested_dir).unwrap();
385+
fs::create_dir(nested_dir).unwrap();
386386

387387
let temp_dir_file = test_tmp.join("outside.txt");
388388
let mut file = fs::File::create(&temp_dir_file).unwrap();
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
[package]
22
name = "empty"
3+
version = "0.1.2"

cargo/private/cargo_toml_info/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ fn lint_priority(lint: &cargo_toml::Lint) -> i32 {
107107
fn format_lint_set<'a>(
108108
lints: Option<&'a BTreeMap<String, BTreeMap<String, Lint>>>,
109109
group: &'a LintGroup,
110-
) -> Option<impl Iterator<Item = String> + use<'a>> {
110+
) -> Option<impl Iterator<Item = String> + 'a> {
111111
let lints = lints?.get(group.key())?;
112112
let mut lints = Vec::from_iter(lints);
113113
lints.sort_by(|(_, a), (_, b)| {

0 commit comments

Comments
 (0)