Skip to content

Commit f8598e5

Browse files
committed
refactor: rename from target_linkers to linkers
as this collects both host and target build targets
1 parent 0bdcc62 commit f8598e5

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

src/cargo/core/compiler/compilation.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ pub struct Compilation<'gctx> {
132132
/// The runner to use for each host or target process.
133133
runners: HashMap<CompileKind, Option<(PathBuf, Vec<String>)>>,
134134
/// The linker to use for each host or target.
135-
target_linkers: HashMap<CompileKind, Option<PathBuf>>,
135+
linkers: HashMap<CompileKind, Option<PathBuf>>,
136136

137137
/// The total number of lint warnings emitted by the compilation.
138138
pub lint_warning_count: usize,
@@ -160,7 +160,7 @@ impl<'gctx> Compilation<'gctx> {
160160
runners.insert(kind, target_runner(bcx, kind)?);
161161
}
162162

163-
let mut target_linkers = bcx
163+
let mut linkers = bcx
164164
.build_config
165165
.requested_kinds
166166
.iter()
@@ -170,7 +170,7 @@ impl<'gctx> Compilation<'gctx> {
170170
if !bcx.gctx.target_applies_to_host()? {
171171
// See above reason in runner why we do this.
172172
let kind = explicit_host_kind(&host);
173-
target_linkers.insert(kind, target_linker(bcx, kind)?);
173+
linkers.insert(kind, target_linker(bcx, kind)?);
174174
}
175175
Ok(Compilation {
176176
native_dirs: BTreeSet::new(),
@@ -190,7 +190,7 @@ impl<'gctx> Compilation<'gctx> {
190190
rustc_workspace_wrapper_process,
191191
primary_rustc_process,
192192
runners,
193-
target_linkers,
193+
linkers,
194194
lint_warning_count: 0,
195195
})
196196
}
@@ -287,7 +287,7 @@ impl<'gctx> Compilation<'gctx> {
287287

288288
/// Gets the `[host.linker]` for host build target (build scripts and proc macros).
289289
pub fn host_linker(&self) -> Option<&Path> {
290-
self.target_linkers
290+
self.linkers
291291
.get(&CompileKind::Host)
292292
.and_then(|x| x.as_ref())
293293
.map(|x| x.as_path())
@@ -303,7 +303,7 @@ impl<'gctx> Compilation<'gctx> {
303303
} else {
304304
kind
305305
};
306-
self.target_linkers
306+
self.linkers
307307
.get(&kind)
308308
.and_then(|x| x.as_ref())
309309
.map(|x| x.as_path())

0 commit comments

Comments
 (0)