about summary refs log tree commit diff
path: root/src/librustdoc
diff options
context:
space:
mode:
authorAaron Hill <aa1ronham@gmail.com>2019-03-24 23:06:32 -0400
committerAaron Hill <aa1ronham@gmail.com>2019-04-14 00:37:25 -0400
commit7cc3ce3bbd59f0b5876a5d3c0b02aa8f893a2bdd (patch)
treee97d054a265d319ba16a1951ee7cb3061ee4b740 /src/librustdoc
parent21491dc7012ae50ecdc694b5ee664ecc502ae2c5 (diff)
downloadrust-7cc3ce3bbd59f0b5876a5d3c0b02aa8f893a2bdd.tar.gz
rust-7cc3ce3bbd59f0b5876a5d3c0b02aa8f893a2bdd.zip
Combine 'Extern' and 'ExternPrivate'
Diffstat (limited to 'src/librustdoc')
-rw-r--r--src/librustdoc/config.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/librustdoc/config.rs b/src/librustdoc/config.rs
index f2682e00430..80c0911fee1 100644
--- a/src/librustdoc/config.rs
+++ b/src/librustdoc/config.rs
@@ -7,7 +7,7 @@ use errors::emitter::ColorConfig;
 use getopts;
 use rustc::lint::Level;
 use rustc::session::early_error;
-use rustc::session::config::{CodegenOptions, DebuggingOptions, ErrorOutputType, Externs};
+use rustc::session::config::{CodegenOptions, DebuggingOptions, ErrorOutputType, Externs, ExternEntry};
 use rustc::session::config::{nightly_options, build_codegen_options, build_debugging_options,
                              get_cmd_lint_options};
 use rustc::session::search_paths::SearchPath;
@@ -588,7 +588,8 @@ fn parse_externs(matches: &getopts::Matches) -> Result<Externs, String> {
                         enable `--extern crate_name` without `=path`".to_string());
         }
         let name = name.to_string();
-        externs.entry(name).or_default().insert(location);
+        // For Rustdoc purposes, we can treat all externs as public
+        externs.entry(name).or_default().insert(ExternEntry { location, public: true });
     }
     Ok(Externs::new(externs))
 }