Merge pull request #19821 from github/redsun82/backport-lock-fixes

Rust: backport `Cargo.lock` fixes for CI

Author: redsun82

rust/extractor/src/qltest.rs

@@ -4,7 +4,6 @@ use glob::glob;
 use itertools::Itertools;
 use std::ffi::OsStr;
 use std::fs;
-use std::path::Path;
 use std::process::Command;
 use tracing::info;
 
@@ -60,18 +59,9 @@ fn set_sources(config: &mut Config) -> anyhow::Result<()> {
     Ok(())
 }
 
-fn remove_file_if_exists(path: &Path) -> anyhow::Result<()> {
-    match fs::remove_file(path) {
-        Err(e) if e.kind() == std::io::ErrorKind::NotFound => Ok(()),
-        x => x,
-    }
-    .context(format!("removing file {}", path.display()))
-}
-
 pub(crate) fn prepare(config: &mut Config) -> anyhow::Result<()> {
     dump_lib()?;
     set_sources(config)?;
-    remove_file_if_exists(Path::new("Cargo.lock"))?;
     dump_cargo_manifest(&config.qltest_dependencies)?;
     if config.qltest_cargo_check {
         let status = Command::new("cargo")

rust/ql/test/.gitignore

@@ -1,4 +1,3 @@
 Cargo.toml
-Cargo.lock
 lib.rs
 target/

rust/ql/test/extractor-tests/File/Cargo.lock

@@ -18,7 +18,7 @@
 #-----| core -> Crate([email protected])
 #-----| compiler_builtins -> Crate([email protected])
 
-#-----| Crate([email protected].0)
+#-----| Crate([email protected].1)
 #-----| proc_macro -> Crate([email protected])
 #-----| alloc -> Crate([email protected])
 #-----| core -> Crate([email protected])
@@ -89,7 +89,7 @@ main.rs:
 #-----| core -> Crate([email protected])
 #-----| std -> Crate([email protected])
 #-----| test -> Crate([email protected])
-#-----| cfg_if -> Crate([email protected].0)
+#-----| cfg_if -> Crate([email protected].1)
 #-----| digest -> Crate([email protected])
 
 #-----| Crate([email protected])