Skip to content

Commit 4edd748

Browse files
committed
Ensure tidy never updates Cargo.lock
Otherwise the results may be outdated compared to a build at a later time. Also disable checking for the backtrace workspace until Cargo.lock is committed.
1 parent 175e432 commit 4edd748

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/tools/tidy/src/deps.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ pub(crate) const WORKSPACES: &[(&str, ExceptionList, Option<(&[&str], &[&str])>)
5454
),
5555
// tidy-alphabetical-start
5656
("compiler/rustc_codegen_gcc", EXCEPTIONS_GCC, None),
57-
("library/backtrace", &[], None),
57+
//("library/backtrace", &[], None), // FIXME uncomment once rust-lang/backtrace#562 lands
5858
//("library/portable-simd", &[], None), // FIXME uncomment once rust-lang/portable-simd#363 has been synced back to the rust repo
5959
//("library/stdarch", EXCEPTIONS_STDARCH, None), // FIXME uncomment once rust-lang/stdarch#1462 lands
6060
("src/bootstrap", EXCEPTIONS_BOOTSTRAP, None),
@@ -467,7 +467,8 @@ pub fn check(root: &Path, cargo: &Path, bad: &mut bool) {
467467
let mut cmd = cargo_metadata::MetadataCommand::new();
468468
cmd.cargo_path(cargo)
469469
.manifest_path(root.join(workspace).join("Cargo.toml"))
470-
.features(cargo_metadata::CargoOpt::AllFeatures);
470+
.features(cargo_metadata::CargoOpt::AllFeatures)
471+
.other_options(vec!["--locked".to_owned()]);
471472
let metadata = t!(cmd.exec());
472473

473474
check_license_exceptions(&metadata, exceptions, bad);

0 commit comments

Comments
 (0)