Skip to content

save-dir: Handle @filename and thin archives #777

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
davidlattimore merged 1 commit into from
May 26, 2025
Merged

save-dir: Handle @filename and thin archives #777

Show file tree
Hide file tree
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
13 changes: 8 additions & 5 deletions libwild/src/args.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ impl Default for Args {
}

// Parse the supplied input arguments, which should not include the program name.
pub(crate) fn parse<S: AsRef<str>, I: Iterator<Item = S>>(mut input: I) -> Result<Args> {
pub(crate) fn parse<F: Fn() -> I, S: AsRef<str>, I: Iterator<Item = S>>(input: F) -> Result<Args> {
let mut args = Args {
files_per_group: std::env::var(FILES_PER_GROUP_ENV)
.ok()
Expand All @@ -300,7 +300,9 @@ pub(crate) fn parse<S: AsRef<str>, I: Iterator<Item = S>>(mut input: I) -> Resul

let mut unrecognised = Vec::new();

let mut save_dir = SaveDir::new()?;
let mut save_dir = SaveDir::new(&input)?;

let mut input = input();

let mut modifier_stack = vec![Modifiers::default()];

Expand Down Expand Up @@ -654,11 +656,12 @@ const fn default_target_arch() -> Architecture {
fn parse_from_argument_file(path: &Path) -> Result<Args> {
let contents = std::fs::read_to_string(path)
.with_context(|| format!("Failed to read arguments from file `{}`", path.display()))?;
parse(arguments_from_string(&contents)?.into_iter())
let arguments = arguments_from_string(&contents)?;
parse(|| arguments.iter())
}

impl Args {
pub fn parse<S: AsRef<str>, I: Iterator<Item = S>>(input: I) -> Result<Args> {
pub fn parse<F: Fn() -> I, S: AsRef<str>, I: Iterator<Item = S>>(input: F) -> Result<Args> {
parse(input)
}

Expand Down Expand Up @@ -1032,7 +1035,7 @@ mod tests {

#[test]
fn test_parse() {
let args = super::parse(INPUT1.iter()).unwrap();
let args = super::parse(|| INPUT1.iter()).unwrap();
assert!(args.is_relocatable());
assert_eq!(
args.inputs
Expand Down
Loading