diff options
| author | bors <bors@rust-lang.org> | 2021-04-03 10:59:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-04-03 10:59:24 +0000 |
| commit | 640ce99bfe70375a24c6775a937d6a258b40398b (patch) | |
| tree | 2cb8aa2003dc7ae7d030460f65ce5d7e4f5bfd4a /src/tools/compiletest | |
| parent | ccd997592bf545fc54a9cce31f1280f833915ba1 (diff) | |
| parent | e4244e37103d83b2cd54637ca2ac4f1c76c35a43 (diff) | |
| download | rust-640ce99bfe70375a24c6775a937d6a258b40398b.tar.gz rust-640ce99bfe70375a24c6775a937d6a258b40398b.zip | |
Auto merge of #83738 - jyn514:only-load-some-crates, r=petrochenkov
rustdoc: Don't load all extern crates unconditionally Instead, only load the crates that are linked to with intra-doc links. This doesn't help very much with any of rustdoc's fundamental issues with freezing the resolver, but it at least fixes a stable-to-stable regression, and makes the crate loading model somewhat more consistent with rustc's. I tested and it unfortunately does not help at all with https://github.com/rust-lang/rust/pull/82496. Closes https://github.com/rust-lang/rust/issues/68427. Let me know if you want me to open a separate issue for not freezing the resolver. r? `@petrochenkov` cc `@eddyb` `@ollie27`
Diffstat (limited to 'src/tools/compiletest')
| -rw-r--r-- | src/tools/compiletest/src/header.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs index 83ea676e8f4..531a23d76a2 100644 --- a/src/tools/compiletest/src/header.rs +++ b/src/tools/compiletest/src/header.rs @@ -708,8 +708,8 @@ impl Config { self.parse_name_value_directive(line, "aux-crate").map(|r| { let mut parts = r.trim().splitn(2, '='); ( - parts.next().expect("aux-crate name").to_string(), - parts.next().expect("aux-crate value").to_string(), + parts.next().expect("missing aux-crate name (e.g. log=log.rs)").to_string(), + parts.next().expect("missing aux-crate value (e.g. log=log.rs)").to_string(), ) }) } |
