about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAaron Hill <aa1ronham@gmail.com>2019-01-31 14:36:26 -0500
committerAaron Hill <aa1ronham@gmail.com>2019-02-01 09:43:57 -0500
commit369faaeaffa1b960f8260a1905b1fc34f33a23f6 (patch)
treefe0983b90629d135d317b087cd6a9da26e2edf7f
parent541d31531322bd1d5f2bf7bb8b9cf4c79d85f01d (diff)
downloadrust-369faaeaffa1b960f8260a1905b1fc34f33a23f6.tar.gz
rust-369faaeaffa1b960f8260a1905b1fc34f33a23f6.zip
Cleanup unecessary code
-rw-r--r--src/librustc/session/config.rs10
-rw-r--r--src/librustc_privacy/lib.rs5
2 files changed, 0 insertions, 15 deletions
diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs
index 6b12e549c33..86f676fbf88 100644
--- a/src/librustc/session/config.rs
+++ b/src/librustc/session/config.rs
@@ -1653,13 +1653,6 @@ pub fn rustc_short_optgroups() -> Vec<RustcOptGroup> {
                                     for the compiler to emit",
             "[bin|lib|rlib|dylib|cdylib|staticlib|proc-macro]",
         ),
-        opt::multi_s(
-            "",
-            "extern-public",
-            "Comma separated list of crates to consider 'public'
-                                     for linting purposes",
-            "CRATES",
-        ),
         opt::opt_s(
             "",
             "crate-name",
@@ -1942,9 +1935,6 @@ pub fn build_session_options_and_crate_config(
         );
     }
 
-
-
-
     let mut output_types = BTreeMap::new();
     if !debugging_opts.parse_only {
         for list in matches.opt_strs("emit") {
diff --git a/src/librustc_privacy/lib.rs b/src/librustc_privacy/lib.rs
index 3d67aeff00e..73f83eb6f7a 100644
--- a/src/librustc_privacy/lib.rs
+++ b/src/librustc_privacy/lib.rs
@@ -1538,14 +1538,9 @@ impl<'a, 'tcx: 'a> SearchInterfaceForPrivateItemsVisitor<'a, 'tcx> {
     /// 1. It's contained within a public type
     /// 2. It comes from a private crate
     fn leaks_private_dep(&self, item_id: DefId) -> bool {
-        // Don't do any leak checking if no private crates were specified
-        if self.private_crates.is_empty() {
-            return false
-        }
         let ret = self.required_visibility == ty::Visibility::Public &&
             self.private_crates.contains(&item_id.krate);
 
-
         debug!("leaks_private_dep(item_id={:?})={}", item_id, ret);
         return ret;
     }