about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbjorn3 <17426603+bjorn3@users.noreply.github.com>2023-08-27 16:41:04 +0000
committerbjorn3 <17426603+bjorn3@users.noreply.github.com>2023-10-10 12:47:26 +0000
commit4edd74821af6e63369fe722d20fc6c689b27dbaf (patch)
treeee34c910d09d3adbc181628cdb137347ab6b183d
parent175e4326f73935fb4c2d976ceb2b26ea2888bee4 (diff)
downloadrust-4edd74821af6e63369fe722d20fc6c689b27dbaf.tar.gz
rust-4edd74821af6e63369fe722d20fc6c689b27dbaf.zip
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.
-rw-r--r--src/tools/tidy/src/deps.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs
index a4b1676790d..07be91bbeb4 100644
--- a/src/tools/tidy/src/deps.rs
+++ b/src/tools/tidy/src/deps.rs
@@ -54,7 +54,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),
@@ -467,7 +467,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);