Skip to content

Stop having an explicit list of allowed file names for pruning #24

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Oct 29, 2020
Merged

Stop having an explicit list of allowed file names for pruning #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,6 @@ use crate::config::{Channel, Config};

const TARGET: &str = env!("TARGET");

/// List of files that should not be pruned even if they're not referenced in the manifest.
const AVOID_PRUNING_UNUSED_FILES: &[&str] = &[
// Source code tarballs, which are not distributed through rustup and thus are mistakenly
// marked as "unused" by build-manifest.
"rustc-{release}-src.tar.gz",
"rustc-{release}-src.tar.xz",
];

struct Context {
work: PathBuf,
handle: Easy,
Expand Down Expand Up @@ -475,18 +467,11 @@ upload-addr = \"{}/{}\"
}

fn prune_unused_files(&self, shipped_files: &HashSet<PathBuf>) -> Result<(), Error> {
let release = self.config.channel.release_name(self);
let allowed_files = AVOID_PRUNING_UNUSED_FILES
.iter()
.map(|pattern| pattern.replace("{release}", &release).into())
.collect::<HashSet<PathBuf>>();

for entry in std::fs::read_dir(self.dl_dir())? {
let entry = entry?;

if let Some(name) = entry.path().file_name() {
let name = Path::new(name);
if !allowed_files.contains(name) && !shipped_files.contains(name) {
if !shipped_files.contains(name) {
std::fs::remove_file(entry.path())?;
println!("pruned unused file {}", name.display());
}
Expand Down