Skip to content

Commit 5a051eb

Browse files
committed
remove host & target attributes
1 parent f9f62ff commit 5a051eb

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

src/cargo/core/compiler/compilation.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,6 @@ pub struct Compilation<'cfg> {
6969
/// Flags to pass to rustdoc when invoked from cargo test, per package.
7070
pub rustdocflags: HashMap<PackageId, Vec<String>>,
7171

72-
pub host: String,
73-
pub target: String,
74-
7572
config: &'cfg Config,
7673

7774
/// Rustc process to be used by default
@@ -129,8 +126,6 @@ impl<'cfg> Compilation<'cfg> {
129126
rustc_process: rustc,
130127
rustc_workspace_wrapper_process,
131128
primary_rustc_process,
132-
host: bcx.host_triple().to_string(),
133-
target: bcx.target_data.short_name(&default_kind).to_string(),
134129
target_runner: target_runner(bcx, default_kind)?,
135130
})
136131
}

src/cargo/ops/cargo_test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ fn run_doc_tests(
144144
let mut runtool: &Option<(std::path::PathBuf, Vec<String>)> = &None;
145145
if doctest_xcompile {
146146
runtool = compilation.target_runner();
147-
} else if compilation.host != compilation.target {
147+
} else if options.compile_opts.build_config.requested_kind.is_host() {
148148
return Ok((Test::Doc, errors));
149149
}
150150

0 commit comments

Comments
 (0)