-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Use TempDir
for copied lockfiles
#20290
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -552,6 +552,7 @@ impl CargoWorkspace { | |
|
||
pub(crate) struct FetchMetadata { | ||
command: cargo_metadata::MetadataCommand, | ||
manifest_path: ManifestPath, | ||
lockfile_path: Option<Utf8PathBuf>, | ||
kind: &'static str, | ||
no_deps: bool, | ||
|
@@ -655,7 +656,15 @@ impl FetchMetadata { | |
} | ||
.with_context(|| format!("Failed to run `{cargo_command:?}`")); | ||
|
||
Self { command, lockfile_path, kind: config.kind, no_deps, no_deps_result, other_options } | ||
Self { | ||
manifest_path: cargo_toml.clone(), | ||
command, | ||
lockfile_path, | ||
kind: config.kind, | ||
no_deps, | ||
no_deps_result, | ||
other_options, | ||
} | ||
} | ||
|
||
pub(crate) fn no_deps_metadata(&self) -> Option<&cargo_metadata::Metadata> { | ||
|
@@ -672,18 +681,47 @@ impl FetchMetadata { | |
locked: bool, | ||
progress: &dyn Fn(String), | ||
) -> anyhow::Result<(cargo_metadata::Metadata, Option<anyhow::Error>)> { | ||
let Self { mut command, lockfile_path, kind, no_deps, no_deps_result, mut other_options } = | ||
self; | ||
let Self { | ||
mut command, | ||
manifest_path, | ||
lockfile_path, | ||
kind, | ||
no_deps, | ||
no_deps_result, | ||
mut other_options, | ||
} = self; | ||
|
||
if no_deps { | ||
return no_deps_result.map(|m| (m, None)); | ||
} | ||
|
||
let mut using_lockfile_copy = false; | ||
let mut _temp_dir_guard = None; | ||
// The manifest is a rust file, so this means its a script manifest | ||
if let Some(lockfile) = lockfile_path { | ||
let target_lockfile = | ||
target_dir.join("rust-analyzer").join("metadata").join(kind).join("Cargo.lock"); | ||
_temp_dir_guard = temp_dir::TempDir::with_prefix("rust-analyzer").ok(); | ||
let target_lockfile = _temp_dir_guard | ||
.and_then(|tmp| tmp.path().join("Cargo.lock").try_into().ok()) | ||
.unwrap_or_else(|| { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think failures on creating |
||
// When multiple workspaces share the same target dir, they might overwrite into a | ||
// single lockfile path. | ||
// See https://github.com/rust-lang/rust-analyzer/issues/20189#issuecomment-3073520255 | ||
let manifest_path_hash = std::hash::BuildHasher::hash_one( | ||
&std::hash::BuildHasherDefault::<rustc_hash::FxHasher>::default(), | ||
&manifest_path, | ||
); | ||
let disambiguator = format!( | ||
"{}_{manifest_path_hash}", | ||
manifest_path.components().nth_back(1).map_or("", |c| c.as_str()) | ||
); | ||
|
||
target_dir | ||
.join("rust-analyzer") | ||
.join("metadata") | ||
.join(kind) | ||
.join(disambiguator) | ||
.join("Cargo.lock") | ||
}); | ||
match std::fs::copy(&lockfile, &target_lockfile) { | ||
Ok(_) => { | ||
using_lockfile_copy = true; | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I chose this crate because it uses short, safe Rust codes and has no deps
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TIL
temp-dir
(besidestempdir
, which is very popular, andtempfile
, which is unmaintained).