Skip to content

Commit 6bbf832

Browse files
committedNov 24, 2024·
Remove unnecessary 0 link args optimization
1 parent cb6f8fa commit 6bbf832

File tree

1 file changed

+3
-14
lines changed

1 file changed

+3
-14
lines changed
 

Diff for: ‎compiler/rustc_codegen_ssa/src/back/linker.rs

+3-14
Original file line numberDiff line numberDiff line change
@@ -183,15 +183,7 @@ fn verbatim_args<L: Linker + ?Sized>(
183183
}
184184
/// Add underlying linker arguments to C compiler command, by wrapping them in
185185
/// `-Wl` or `-Xlinker`.
186-
fn convert_link_args_to_cc_args(
187-
cmd: &mut Command,
188-
args: impl IntoIterator<Item: AsRef<OsStr>, IntoIter: ExactSizeIterator>,
189-
) {
190-
let args = args.into_iter();
191-
if args.len() == 0 {
192-
return;
193-
}
194-
186+
fn convert_link_args_to_cc_args(cmd: &mut Command, args: impl IntoIterator<Item: AsRef<OsStr>>) {
195187
let mut combined_arg = OsString::from("-Wl");
196188
for arg in args {
197189
// If the argument itself contains a comma, we need to emit it
@@ -220,10 +212,7 @@ fn convert_link_args_to_cc_args(
220212
}
221213
/// Arguments for the underlying linker.
222214
/// Add options to pass them through cc wrapper if `Linker` is a cc wrapper.
223-
fn link_args<L: Linker + ?Sized>(
224-
l: &mut L,
225-
args: impl IntoIterator<Item: AsRef<OsStr>, IntoIter: ExactSizeIterator>,
226-
) -> &mut L {
215+
fn link_args<L: Linker + ?Sized>(l: &mut L, args: impl IntoIterator<Item: AsRef<OsStr>>) -> &mut L {
227216
if !l.is_cc() {
228217
verbatim_args(l, args);
229218
} else {
@@ -257,7 +246,7 @@ macro_rules! generate_arg_methods {
257246
verbatim_args(self, iter::once(arg))
258247
}
259248
#[allow(unused)]
260-
pub(crate) fn link_args(&mut self, args: impl IntoIterator<Item: AsRef<OsStr>, IntoIter: ExactSizeIterator>) -> &mut Self {
249+
pub(crate) fn link_args(&mut self, args: impl IntoIterator<Item: AsRef<OsStr>>) -> &mut Self {
261250
link_args(self, args)
262251
}
263252
#[allow(unused)]

0 commit comments

Comments
 (0)
Please sign in to comment.