diff options
| author | bors <bors@rust-lang.org> | 2018-10-18 15:44:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-10-18 15:44:30 +0000 |
| commit | 777a59a4fcc36e06098de30f6a73eb0ea5f4a53e (patch) | |
| tree | 5a4c80210079f23b6be9a71bc6d37fd41dbad6d2 /src/librustdoc/core.rs | |
| parent | 590121930fc942315c84340a824b5313ad395eee (diff) | |
| parent | b2e0bee4bc9d4913036e2241f53acf16ff2e0e89 (diff) | |
| download | rust-777a59a4fcc36e06098de30f6a73eb0ea5f4a53e.tar.gz rust-777a59a4fcc36e06098de30f6a73eb0ea5f4a53e.zip | |
Auto merge of #55184 - pietroalbini:beta-backports, r=pietroalbini
[beta] Rollup backports Merged and approved: * #54300: Updated RELEASES.md for 1.30.0 * #54939: rustdoc: don't prefer dynamic linking in doc tests * #54671: resolve: Scale back hard-coded extern prelude additions on 2015 edition * #55102: resolve: Do not skip extern prelude during speculative resolution r? @ghost
Diffstat (limited to 'src/librustdoc/core.rs')
| -rw-r--r-- | src/librustdoc/core.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs index ee0c6ee005d..7b46b632b1a 100644 --- a/src/librustdoc/core.rs +++ b/src/librustdoc/core.rs @@ -457,6 +457,7 @@ pub fn run_core(search_paths: SearchPaths, trait_map: resolver.trait_map.clone(), maybe_unused_trait_imports: resolver.maybe_unused_trait_imports.clone(), maybe_unused_extern_crates: resolver.maybe_unused_extern_crates.clone(), + extern_prelude: resolver.extern_prelude.clone(), }; let analysis = ty::CrateAnalysis { access_levels: Lrc::new(AccessLevels::default()), |