Skip to content

v2: Remove file exclusion by target path #2890

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

Draft
e-nomem wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

v2: Remove file exclusion by target path #2890

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
15 changes: 0 additions & 15 deletions src/module_writer/virtual_writer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ pub struct VirtualWriter<W> {
inner: W,
tracker: HashMap<PathBuf, ArchiveSource>,
excludes: Override,
target_exclusion_warning_emitted: bool,
temp_dir: OnceCell<Rc<TempDir>>,
}

Expand All @@ -54,7 +53,6 @@ impl<W: ModuleWriterInternal> VirtualWriter<W> {
inner,
tracker: HashMap::new(),
excludes,
target_exclusion_warning_emitted: false,
temp_dir: OnceCell::new(),
}
}
Expand Down Expand Up @@ -89,19 +87,6 @@ impl<W: ModuleWriterInternal> VirtualWriter<W> {
}
}

if self.exclude(&target) {
if !self.target_exclusion_warning_emitted {
self.target_exclusion_warning_emitted = true;
eprintln!(
"⚠️ Warning: A file was excluded from the archive by the target path in the archive\n\
⚠️ instead of the source path on the filesystem. This behavior is deprecated and\n\
⚠️ will be removed in future versions of maturin.",
);
}
debug!("Excluded file {target:?} from archive by target path");
return Ok(None);
}

let entry = match self.tracker.entry(target.clone()) {
Entry::Vacant(entry) => Some(entry),
Entry::Occupied(entry) => {
Expand Down
Loading