Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ workspace = true
[workspace.lints.clippy]
cloned_instead_of_copied = "warn"
cloned_ref_to_slice_refs = "warn"
from_iter_instead_of_collect = "warn"
explicit_into_iter_loop = "warn"
implicit_clone = "warn"
semicolon_if_nothing_returned = "warn"
Expand Down
25 changes: 11 additions & 14 deletions src/compiler/args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -682,8 +682,7 @@ macro_rules! take_arg {
#[cfg(test)]
mod tests {
use super::*;
use itertools::{Diff, diff_with};
use std::iter::FromIterator;
use itertools::{Diff, Itertools as _, diff_with};

macro_rules! arg {
($name:ident($x:expr)) => {
Expand Down Expand Up @@ -1028,40 +1027,38 @@ mod tests {
}
}

// https://github.com/rust-lang/rust-clippy/issues/6550
#[allow(clippy::from_iter_instead_of_collect)]
#[test]
fn test_argument_into_iter() {
// Needs type annotation or ascription
let raw: Argument<ArgData> = arg!(Raw("value"));
let unknown: Argument<ArgData> = arg!(UnknownFlag("-foo"));
assert_eq!(Vec::from_iter(raw.iter_os_strings()), ovec!["value"]);
assert_eq!(Vec::from_iter(unknown.iter_os_strings()), ovec!["-foo"]);
assert_eq!(raw.iter_os_strings().collect_vec(), ovec!["value"]);
assert_eq!(unknown.iter_os_strings().collect_vec(), ovec!["-foo"]);
assert_eq!(
Vec::from_iter(arg!(Flag("-foo", FooFlag)).iter_os_strings()),
arg!(Flag("-foo", FooFlag)).iter_os_strings().collect_vec(),
ovec!["-foo"]
);

let arg = arg!(WithValue("-foo", Foo("bar"), Concatenated));
assert_eq!(Vec::from_iter(arg.iter_os_strings()), ovec!["-foobar"]);
assert_eq!(arg.iter_os_strings().collect_vec(), ovec!["-foobar"]);

let arg = arg!(WithValue("-foo", Foo("bar"), Concatenated(b'=')));
assert_eq!(Vec::from_iter(arg.iter_os_strings()), ovec!["-foo=bar"]);
assert_eq!(arg.iter_os_strings().collect_vec(), ovec!["-foo=bar"]);

let arg = arg!(WithValue("-foo", Foo("bar"), CanBeSeparated));
assert_eq!(Vec::from_iter(arg.iter_os_strings()), ovec!["-foobar"]);
assert_eq!(arg.iter_os_strings().collect_vec(), ovec!["-foobar"]);

let arg = arg!(WithValue("-foo", Foo("bar"), CanBeSeparated(b'=')));
assert_eq!(Vec::from_iter(arg.iter_os_strings()), ovec!["-foo=bar"]);
assert_eq!(arg.iter_os_strings().collect_vec(), ovec!["-foo=bar"]);

let arg = arg!(WithValue("-foo", Foo("bar"), CanBeConcatenated));
assert_eq!(Vec::from_iter(arg.iter_os_strings()), ovec!["-foo", "bar"]);
assert_eq!(arg.iter_os_strings().collect_vec(), ovec!["-foo", "bar"]);

let arg = arg!(WithValue("-foo", Foo("bar"), CanBeConcatenated(b'=')));
assert_eq!(Vec::from_iter(arg.iter_os_strings()), ovec!["-foo", "bar"]);
assert_eq!(arg.iter_os_strings().collect_vec(), ovec!["-foo", "bar"]);

let arg = arg!(WithValue("-foo", Foo("bar"), Separated));
assert_eq!(Vec::from_iter(arg.iter_os_strings()), ovec!["-foo", "bar"]);
assert_eq!(arg.iter_os_strings().collect_vec(), ovec!["-foo", "bar"]);
}

#[test]
Expand Down
3 changes: 2 additions & 1 deletion src/compiler/compiler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ use async_trait::async_trait;
use filetime::FileTime;
use fs::File;
use fs_err as fs;
use itertools::Itertools as _;
use serde::{Deserialize, Serialize};
use std::borrow::Cow;
use std::ffi::{OsStr, OsString};
Expand Down Expand Up @@ -1710,7 +1711,7 @@ compiler_version=__VERSION__
let arg = arg.unwrap_or_else(|_| Argument::Raw(OsString::from("")));
if let Some(Detect_PassThrough(_)) = arg.get_data() {
let required_arg = arg.normalize(NormalizedDisposition::Concatenated);
cmd.args(&Vec::from_iter(required_arg.iter_os_strings()));
cmd.args(&required_arg.iter_os_strings().collect_vec());
}
}

Expand Down
Loading