Skip to content

Commit

Permalink
Ensure tidy never updates Cargo.lock
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bjorn3 committed Aug 27, 2023
1 parent 01920a0 commit 8c61044
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/tools/tidy/src/deps.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ pub(crate) const WORKSPACES: &[(&str, ExceptionList, Option<(&[&str], &[&str])>)
),
// tidy-alphabetical-start
("compiler/rustc_codegen_gcc", EXCEPTIONS_GCC, None),
("library/backtrace", &[], None),
//("library/backtrace", &[], None), // FIXME uncomment once rust-lang/backtrace#562 lands
//("library/portable-simd", &[], None), // FIXME uncomment once rust-lang/portable-simd#363 has been synced back to the rust repo
//("library/stdarch", EXCEPTIONS_STDARCH, None), // FIXME uncomment once rust-lang/stdarch#1462 lands
("src/bootstrap", EXCEPTIONS_BOOTSTRAP, None),
Expand Down Expand Up @@ -465,7 +465,8 @@ pub fn check(root: &Path, cargo: &Path, bad: &mut bool) {
let mut cmd = cargo_metadata::MetadataCommand::new();
cmd.cargo_path(cargo)
.manifest_path(root.join(workspace).join("Cargo.toml"))
.features(cargo_metadata::CargoOpt::AllFeatures);
.features(cargo_metadata::CargoOpt::AllFeatures)
.other_options(vec!["--locked".to_owned()]);
let metadata = t!(cmd.exec());

check_license_exceptions(&metadata, exceptions, bad);
Expand Down

0 comments on commit 8c61044

Please sign in to comment.