Skip to content

Commit 53031b2

Browse files
KobzolKobzol
committed
Review fixes
1 parent 4750e9d commit 53031b2

4 files changed

Lines changed: 21 additions & 21 deletions

File tree

‎src/bootstrap/src/core/build_steps/test.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ use crate::utils::cache::{Interned, INTERNER};
3030
use crate::utils::exec::BootstrapCommand;
3131
use crate::utils::helpers::{
3232
self, add_link_lib_path, add_rustdoc_cargo_linker_args, dylib_path, dylib_path_var,
33-
linker_args, output, t, target_supports_cranelift_backend, up_to_date, LldThreads,
33+
linker_args, linker_flags, output, t, target_supports_cranelift_backend, up_to_date,
34+
LldThreads,
3435
};
3536
use crate::utils::render_tests::{add_flags_and_try_run_tests, try_run_tests};
3637
use crate::{envify, CLang, DocTests, GitRepo, Mode};
@@ -1746,14 +1747,14 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
17461747

17471748
let mut hostflags = flags.clone();
17481749
hostflags.push(format!("-Lnative={}", builder.test_helpers_out(compiler.host).display()));
1749-
hostflags.extend(linker_args(builder, compiler.host, LldThreads::No));
1750+
hostflags.extend(linker_flags(builder, compiler.host, LldThreads::No));
17501751
for flag in hostflags {
17511752
cmd.arg("--host-rustcflags").arg(flag);
17521753
}
17531754

17541755
let mut targetflags = flags;
17551756
targetflags.push(format!("-Lnative={}", builder.test_helpers_out(target).display()));
1756-
targetflags.extend(linker_args(builder, compiler.host, LldThreads::No));
1757+
targetflags.extend(linker_flags(builder, compiler.host, LldThreads::No));
17571758
for flag in targetflags {
17581759
cmd.arg("--target-rustcflags").arg(flag);
17591760
}

‎src/bootstrap/src/core/builder.rs‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@ use crate::core::build_steps::{check, clean, compile, dist, doc, install, run, s
1919
use crate::core::config::flags::{Color, Subcommand};
2020
use crate::core::config::{DryRun, SplitDebuginfo, TargetSelection};
2121
use crate::utils::cache::{Cache, Interned, INTERNER};
22-
use crate::utils::helpers::{
23-
self, add_dylib_path, add_link_lib_path, exe, linker_args, linker_flags,
24-
};
25-
use crate::utils::helpers::{libdir, output, t, LldThreads};
22+
use crate::utils::helpers::{self, add_dylib_path, add_link_lib_path, exe, linker_args};
23+
use crate::utils::helpers::{libdir, linker_flags, output, t, LldThreads};
2624
use crate::Crate;
2725
use crate::EXTRA_CHECK_CFGS;
2826
use crate::{Build, CLang, DocTests, GitRepo, Mode};
@@ -1675,22 +1673,22 @@ impl<'a> Builder<'a> {
16751673
rustflags.arg(&format!("-Zstack-protector={stack_protector}"));
16761674
}
16771675

1678-
linker_args(self, compiler.host, LldThreads::Yes).into_iter().for_each(|flag| {
1679-
hostflags.arg(flag);
1680-
});
1676+
for arg in linker_args(self, compiler.host, LldThreads::Yes) {
1677+
hostflags.arg(&arg);
1678+
}
16811679

16821680
if let Some(target_linker) = self.linker(target) {
16831681
let target = crate::envify(&target.triple);
16841682
cargo.env(&format!("CARGO_TARGET_{target}_LINKER"), target_linker);
16851683
}
16861684
// We want to set -Clinker using Cargo, therefore we only call `linker_flags` and not
16871685
// `linker_args` here.
1688-
linker_flags(self, target, LldThreads::Yes).into_iter().for_each(|flag| {
1686+
for flag in linker_flags(self, target, LldThreads::Yes) {
16891687
rustflags.arg(&flag);
1690-
});
1691-
linker_args(self, target, LldThreads::Yes).into_iter().for_each(|flag| {
1692-
rustdocflags.arg(&flag);
1693-
});
1688+
}
1689+
for arg in linker_args(self, target, LldThreads::Yes) {
1690+
rustdocflags.arg(&arg);
1691+
}
16941692

16951693
if !(["build", "check", "clippy", "fix", "rustc"].contains(&cmd)) && want_rustdoc {
16961694
cargo.env("RUSTDOC_LIBDIR", self.rustc_libdir(compiler));

‎src/bootstrap/src/core/config/config.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,12 @@ impl Display for DebuginfoLevel {
111111
///
112112
/// It is configured depending on the target:
113113
/// 1) Everything except MSVC
114-
/// - Self-contained: -Clinker-flavor=gnu-lld-cc -Clink-self-contained=+linker
115-
/// - External: -Clinker-flavor=gnu-lld-cc
114+
/// - Self-contained: `-Clinker-flavor=gnu-lld-cc -Clink-self-contained=+linker`
115+
/// - External: `-Clinker-flavor=gnu-lld-cc`
116116
/// 2) MSVC
117-
/// - Self-contained: -Clinker=<path to rust-lld>
118-
/// - External: -Clinker=lld
119-
#[derive(Default, Clone)]
117+
/// - Self-contained: `-Clinker=<path to rust-lld>`
118+
/// - External: `-Clinker=lld`
119+
#[derive(Default, Copy, Clone)]
120120
pub enum LldMode {
121121
/// Do not use LLD
122122
#[default]

‎src/bootstrap/src/utils/helpers.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,7 @@ fn absolute_unix(path: &Path) -> io::Result<PathBuf> {
378378

379379
#[cfg(windows)]
380380
fn absolute_windows(path: &std::path::Path) -> std::io::Result<std::path::PathBuf> {
381+
use std::ffi::OsString;
381382
use std::io::Error;
382383
use std::os::windows::ffi::{OsStrExt, OsStringExt};
383384
use std::ptr::null_mut;
@@ -526,7 +527,7 @@ pub fn linker_flags(
526527
if matches!(lld_threads, LldThreads::No) {
527528
args.push(format!(
528529
"-Clink-arg=-Wl,{}",
529-
lld_flag_no_threads(builder.config.lld_mode.clone(), target.is_msvc())
530+
lld_flag_no_threads(builder.config.lld_mode, target.is_msvc())
530531
));
531532
}
532533
}

0 commit comments

Comments
 (0)