itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-25 11:14:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(vendor): extract vendor filter to a function

Browse Source
This commit is contained in:
Weihang Lo 2025-05-11 13:55:26 -04:00
parent 8fee50a9b8
commit 060ab41ed8
No known key found for this signature in database
GPG Key ID: D7DBF189825E82E7
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/cargo/ops/vendor.rs
View File

@ -368,26 +368,9 @@ fn cp_sources(
let p = p.as_ref(); let p = p.as_ref();
let relative = p.strip_prefix(&src).unwrap(); let relative = p.strip_prefix(&src).unwrap();
match relative.to_str() { if !vendor_this(relative) {
// Skip git config files as they're not relevant to builds most of continue;
// the time and if we respect them (e.g. in git) then it'll }
// probably mess with the checksums when a vendor dir is checked
// into someone else's source control
Some(".gitattributes" | ".gitignore" | ".git") => continue,
// Temporary Cargo files
Some(".cargo-ok") => continue,
// Skip patch-style orig/rej files. Published crates on crates.io
// have `Cargo.toml.orig` which we don't want to use here and
// otherwise these are rarely used as part of the build process.
Some(filename) => {
if filename.ends_with(".orig") || filename.ends_with(".rej") {
continue;
}
}
_ => {}
};
// Join pathname components individually to make sure that the joined // Join pathname components individually to make sure that the joined
// path uses the correct directory separators everywhere, since // path uses the correct directory separators everywhere, since
@ -578,3 +561,25 @@ fn copy_and_checksum<T: Read>(
.with_context(|| format!("failed to write to {:?}", dst_path))?; .with_context(|| format!("failed to write to {:?}", dst_path))?;
} }
} }
/// Filters files we want to vendor.
///
/// `relative` is a path relative to the package root.
fn vendor_this(relative: &Path) -> bool {
match relative.to_str() {
// Skip git config files as they're not relevant to builds most of
// the time and if we respect them (e.g. in git) then it'll
// probably mess with the checksums when a vendor dir is checked
// into someone else's source control
Some(".gitattributes" | ".gitignore" | ".git") => false,
// Temporary Cargo files
Some(".cargo-ok") => false,
// Skip patch-style orig/rej files. Published crates on crates.io
// have `Cargo.toml.orig` which we don't want to use here and
// otherwise these are rarely used as part of the build process.
Some(p) if p.ends_with(".orig") || p.ends_with(".rej") => false,
_ => true,
}
}