about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAaron Hill <aa1ronham@gmail.com>2019-04-02 16:06:43 -0400
committerAaron Hill <aa1ronham@gmail.com>2019-04-14 15:45:18 -0400
commit0f88106940b0d09425a498ce5eef3bcad975a4a2 (patch)
treedbb50f6171ff61ccfbc972c2b02ebcbc723c25de
parent87734b1f2585ccfa4ceb425389a729e432419981 (diff)
downloadrust-0f88106940b0d09425a498ce5eef3bcad975a4a2.tar.gz
rust-0f88106940b0d09425a498ce5eef3bcad975a4a2.zip
Improve formatting
-rw-r--r--src/librustc/session/config.rs25
-rw-r--r--src/librustc_metadata/cstore_impl.rs1
2 files changed, 1 insertions, 25 deletions
diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs
index e07ef35c5d5..bf0e4a77777 100644
--- a/src/librustc/session/config.rs
+++ b/src/librustc/session/config.rs
@@ -443,10 +443,6 @@ top_level_options!(
         remap_path_prefix: Vec<(PathBuf, PathBuf)> [UNTRACKED],
 
         edition: Edition [TRACKED],
-
-        // The crates to consider private when
-        // checking leaked private dependency types in public interfaces
-        //extern_private: ExternPrivates [UNTRACKED],
     }
 );
 
@@ -649,7 +645,6 @@ impl Default for Options {
             cli_forced_thinlto_off: false,
             remap_path_prefix: Vec::new(),
             edition: DEFAULT_EDITION,
-            //extern_private: ExternPrivates(BTreeMap::new())
         }
     }
 }
@@ -2331,23 +2326,6 @@ pub fn build_session_options_and_crate_config(
         )
     }
 
-    /*let mut extern_private: BTreeMap<_, BTreeSet<_>> = BTreeMap::new();
-
-    for arg in matches.opt_strs("extern-private").into_iter() {
-        let mut parts = arg.splitn(2, '=');
-        let name = parts.next().unwrap_or_else(||
-            early_error(error_format, "--extern-private value must not be empty"));
-        let location = parts.next().map(|s| s.to_string()).unwrap_or_else(||
-            early_error(error_format, "--extern-private value must include a location"));
-
-
-        extern_private
-            .entry(name.to_owned())
-            .or_default()
-            .insert(location);
-
-    }*/
-
     // We start out with a Vec<(Option<String>, bool)>>,
     // and later convert it into a BTreeSet<(Option<String>, bool)>
     // This allows to modify entries in-place to set their correct
@@ -2369,7 +2347,7 @@ pub fn build_session_options_and_crate_config(
         };
 
 
-        // Externsl crates start out public,
+        // Extern crates start out public,
         // and become private if we later see
         // an '--extern-private' key. They never
         // go back to being public once we've seen
@@ -2449,7 +2427,6 @@ pub fn build_session_options_and_crate_config(
             cli_forced_thinlto_off: disable_thinlto,
             remap_path_prefix,
             edition,
-            //extern_private: ExternPrivates(extern_private)
         },
         cfg,
     )
diff --git a/src/librustc_metadata/cstore_impl.rs b/src/librustc_metadata/cstore_impl.rs
index 75671facf94..95fe9a70f75 100644
--- a/src/librustc_metadata/cstore_impl.rs
+++ b/src/librustc_metadata/cstore_impl.rs
@@ -399,7 +399,6 @@ impl cstore::CStore {
         r
     }
 
-
     pub fn crate_edition_untracked(&self, cnum: CrateNum) -> Edition {
         self.get_crate_data(cnum).root.edition
     }