Skip to content

Commit 8331d7d

Browse files
willcrichtonwillcrichton
committed
Remove more unused code
1 parent d29ac15 commit 8331d7d

File tree

7 files changed

+37
-76
lines changed

7 files changed

+37
-76
lines changed

‎src/cargo/core/compiler/build_context/mod.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ use crate::util::errors::CargoResult;
88
use crate::util::interning::InternedString;
99
use crate::util::Rustc;
1010
use std::collections::{HashMap, HashSet};
11-
use std::ffi::OsString;
1211
use std::path::PathBuf;
1312

1413
mod target_info;
@@ -32,7 +31,7 @@ pub struct BuildContext<'a, 'cfg> {
3231
pub build_config: &'a BuildConfig,
3332

3433
/// Extra compiler args for either `rustc` or `rustdoc`.
35-
pub extra_compiler_args: HashMap<Unit, Vec<OsString>>,
34+
pub extra_compiler_args: HashMap<Unit, Vec<String>>,
3635

3736
/// Package downloader.
3837
///
@@ -60,7 +59,7 @@ impl<'a, 'cfg> BuildContext<'a, 'cfg> {
6059
packages: PackageSet<'cfg>,
6160
build_config: &'a BuildConfig,
6261
profiles: Profiles,
63-
extra_compiler_args: HashMap<Unit, Vec<OsString>>,
62+
extra_compiler_args: HashMap<Unit, Vec<String>>,
6463
target_data: RustcTargetData<'cfg>,
6564
roots: Vec<Unit>,
6665
unit_graph: UnitGraph,
@@ -124,7 +123,7 @@ impl<'a, 'cfg> BuildContext<'a, 'cfg> {
124123
&self.target_data.info(unit.kind).rustdocflags
125124
}
126125

127-
pub fn extra_args_for(&self, unit: &Unit) -> Option<&Vec<OsString>> {
126+
pub fn extra_args_for(&self, unit: &Unit) -> Option<&Vec<String>> {
128127
self.extra_compiler_args.get(unit)
129128
}
130129
}

‎src/cargo/core/compiler/compilation.rs

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -101,43 +101,6 @@ pub struct Compilation<'cfg> {
101101
target_runners: HashMap<CompileKind, Option<(PathBuf, Vec<String>)>>,
102102
}
103103

104-
impl Doctest {
105-
pub fn rustdoc_process(&self, compilation: &Compilation<'_>) -> CargoResult<ProcessBuilder> {
106-
let Doctest {
107-
args,
108-
unstable_opts,
109-
unit,
110-
linker: _,
111-
script_meta,
112-
} = self;
113-
114-
let mut p = compilation.rustdoc_process(unit, *script_meta)?;
115-
p.arg("--crate-name").arg(&unit.target.crate_name());
116-
p.arg("--test");
117-
118-
for &rust_dep in &[
119-
&compilation.deps_output[&unit.kind],
120-
&compilation.deps_output[&CompileKind::Host],
121-
] {
122-
let mut arg = OsString::from("dependency=");
123-
arg.push(rust_dep);
124-
p.arg("-L").arg(arg);
125-
}
126-
127-
for native_dep in compilation.native_dirs.iter() {
128-
p.arg("-L").arg(native_dep);
129-
}
130-
131-
p.args(args);
132-
133-
if *unstable_opts {
134-
p.arg("-Zunstable-options");
135-
}
136-
137-
Ok(p)
138-
}
139-
}
140-
141104
impl<'cfg> Compilation<'cfg> {
142105
pub fn new<'a>(bcx: &BuildContext<'a, 'cfg>) -> CargoResult<Compilation<'cfg>> {
143106
let mut rustc = bcx.rustc().process();

‎src/cargo/core/compiler/job_queue.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1001,7 +1001,6 @@ impl<'cfg> DrainState<'cfg> {
10011001
let target_name = unit.target.name();
10021002
match unit.mode {
10031003
CompileMode::Doc { .. } => format!("{}(doc)", pkg_name),
1004-
CompileMode::Docscrape { .. } => format!("{}(docscrape)", pkg_name),
10051004
CompileMode::RunCustomBuild => format!("{}(build)", pkg_name),
10061005
CompileMode::Test | CompileMode::Check { test: true } => match unit.target.kind() {
10071006
TargetKind::Lib(_) => format!("{}(test)", target_name),

‎src/cargo/core/compiler/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,7 @@ fn rustdoc(cx: &mut Context<'_, '_>, unit: &Unit) -> CargoResult<Work> {
665665
.arg("--scrape-examples-target-crate")
666666
.arg(root.pkg.name());
667667
}
668-
} else if cx.bcx.scrape_units.len() > 0 {
668+
} else if cx.bcx.scrape_units.len() > 0 && cx.bcx.roots.contains(unit) {
669669
rustdoc.arg("-Zunstable-options");
670670

671671
for scrape_unit in &cx.bcx.scrape_units {

‎src/cargo/ops/cargo_compile.rs

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
//! repeats until the queue is empty.
2424
2525
use std::collections::{BTreeSet, HashMap, HashSet};
26-
use std::ffi::OsString;
2726
use std::hash::{Hash, Hasher};
2827
use std::sync::Arc;
2928

@@ -545,24 +544,6 @@ pub fn create_bcx<'a, 'cfg>(
545544
Default::default()
546545
};
547546

548-
let fmt_unit = |u: &Unit| format!("{} {:?} / {:?}", u.target.name(), u.target.kind(), u.mode);
549-
let fmt_units = |v: &[Unit]| v.iter().map(|u| fmt_unit(u)).collect::<Vec<_>>().join(", ");
550-
let fmt_graph = |g: &UnitGraph| {
551-
g.iter()
552-
.map(|(k, vs)| {
553-
format!(
554-
"{} =>\n{}",
555-
fmt_unit(k),
556-
vs.iter()
557-
.map(|u| format!(" {}", fmt_unit(&u.unit)))
558-
.collect::<Vec<_>>()
559-
.join("\n")
560-
)
561-
})
562-
.collect::<Vec<_>>()
563-
.join("\n")
564-
};
565-
566547
let mut unit_graph = build_unit_dependencies(
567548
ws,
568549
&pkg_set,
@@ -577,9 +558,6 @@ pub fn create_bcx<'a, 'cfg>(
577558
&profiles,
578559
interner,
579560
)?;
580-
println!("SCRAPE UNITS: {}", fmt_units(&scrape_units));
581-
println!("BEFORE ROOTS: {}", fmt_units(&units));
582-
println!("BEFORE GRAPH: {}", fmt_graph(&unit_graph));
583561

584562
// TODO: In theory, Cargo should also dedupe the roots, but I'm uncertain
585563
// what heuristics to use in that case.
@@ -607,8 +585,6 @@ pub fn create_bcx<'a, 'cfg>(
607585
scrape_units = new_graph.1;
608586
unit_graph = new_graph.2;
609587
}
610-
println!("AFTER UNITS: {}", fmt_units(&units));
611-
println!("AFTER GRAPH: {}", fmt_graph(&unit_graph));
612588

613589
let mut extra_compiler_args = HashMap::new();
614590
if let Some(args) = extra_args {
@@ -620,10 +596,7 @@ pub fn create_bcx<'a, 'cfg>(
620596
extra_args_name
621597
);
622598
}
623-
extra_compiler_args.insert(
624-
units[0].clone(),
625-
args.into_iter().map(OsString::from).collect::<Vec<_>>(),
626-
);
599+
extra_compiler_args.insert(units[0].clone(), args);
627600
}
628601

629602
for unit in &units {
@@ -643,7 +616,7 @@ pub fn create_bcx<'a, 'cfg>(
643616
extra_compiler_args
644617
.entry(unit.clone())
645618
.or_default()
646-
.extend(args.into_iter().map(OsString::from));
619+
.extend(args);
647620
}
648621
}
649622
}

‎src/cargo/ops/cargo_test.rs

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,13 @@ fn run_doc_tests(
164164
let doctest_in_workspace = config.cli_unstable().doctest_in_workspace;
165165

166166
for doctest_info in &compilation.to_doc_test {
167-
let Doctest { unit, linker, .. } = doctest_info;
167+
let Doctest {
168+
args,
169+
unstable_opts,
170+
unit,
171+
linker,
172+
script_meta,
173+
} = doctest_info;
168174

169175
if !doctest_xcompile {
170176
match unit.kind {
@@ -179,7 +185,9 @@ fn run_doc_tests(
179185
}
180186

181187
config.shell().status("Doc-tests", unit.target.name())?;
182-
let mut p = doctest_info.rustdoc_process(compilation)?;
188+
let mut p = compilation.rustdoc_process(unit, *script_meta)?;
189+
p.arg("--crate-name").arg(&unit.target.crate_name());
190+
p.arg("--test");
183191

184192
if doctest_in_workspace {
185193
add_path_args(ws, unit, &mut p);
@@ -211,6 +219,19 @@ fn run_doc_tests(
211219
}
212220
}
213221

222+
for &rust_dep in &[
223+
&compilation.deps_output[&unit.kind],
224+
&compilation.deps_output[&CompileKind::Host],
225+
] {
226+
let mut arg = OsString::from("dependency=");
227+
arg.push(rust_dep);
228+
p.arg("-L").arg(arg);
229+
}
230+
231+
for native_dep in compilation.native_dirs.iter() {
232+
p.arg("-L").arg(native_dep);
233+
}
234+
214235
for arg in test_args {
215236
p.arg("--test-args").arg(arg);
216237
}
@@ -219,6 +240,12 @@ fn run_doc_tests(
219240
p.arg("--test-args").arg("--quiet");
220241
}
221242

243+
p.args(args);
244+
245+
if *unstable_opts {
246+
p.arg("-Zunstable-options");
247+
}
248+
222249
config
223250
.shell()
224251
.verbose(|shell| shell.status("Running", p.to_string()))?;

‎tests/testsuite/rename_deps.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,11 +266,11 @@ fn can_run_doc_tests() {
266266
.with_stderr_contains(
267267
"\
268268
[DOCTEST] foo
269-
[RUNNING] `rustdoc [..]--test \
269+
[RUNNING] `rustdoc [..]--test [..]src/lib.rs \
270270
[..] \
271271
--extern bar=[CWD]/target/debug/deps/libbar-[..].rlib \
272272
--extern baz=[CWD]/target/debug/deps/libbar-[..].rlib \
273-
[..]src/lib.rs`
273+
[..]`
274274
",
275275
)
276276
.run();

0 commit comments

Comments
 (0)