about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorAliaksandr Radzivanovich <aradzivanovich@gmail.com>2019-11-19 14:12:30 +0100
committerAliaksandr Radzivanovich <aradzivanovich@gmail.com>2019-11-19 14:22:07 +0100
commit303d2f2e8752cebd95dc4d8bca3ec8edd3718b07 (patch)
tree03a85446a7f192a52129aa5eee23c12c30caca14 /src
parent2cad8bb659066b42fc518c95def384956126bd3f (diff)
downloadrust-303d2f2e8752cebd95dc4d8bca3ec8edd3718b07.tar.gz
rust-303d2f2e8752cebd95dc4d8bca3ec8edd3718b07.zip
Remove duplicate function
Function source_name declared in file

  src/librustc_driver/lib.rs

is a duplicate of a function by the same name declared in file

  src/librustc/session/config.rs
Diffstat (limited to 'src')
-rw-r--r--src/librustc_driver/lib.rs7
-rw-r--r--src/librustc_driver/pretty.rs6
2 files changed, 1 insertions, 12 deletions
diff --git a/src/librustc_driver/lib.rs b/src/librustc_driver/lib.rs
index ef638464adc..6557be9f7ec 100644
--- a/src/librustc_driver/lib.rs
+++ b/src/librustc_driver/lib.rs
@@ -84,13 +84,6 @@ const ICE_REPORT_COMPILER_FLAGS_EXCLUDE: &[&str] = &["metadata", "extra-filename
 
 const ICE_REPORT_COMPILER_FLAGS_STRIP_VALUE: &[&str] = &["incremental"];
 
-pub fn source_name(input: &Input) -> FileName {
-    match *input {
-        Input::File(ref ifile) => ifile.clone().into(),
-        Input::Str { ref name, .. } => name.clone(),
-    }
-}
-
 pub fn abort_on_err<T>(result: Result<T, ErrorReported>, sess: &Session) -> T {
     match result {
         Err(..) => {
diff --git a/src/librustc_driver/pretty.rs b/src/librustc_driver/pretty.rs
index 23253dc4dad..e869607c970 100644
--- a/src/librustc_driver/pretty.rs
+++ b/src/librustc_driver/pretty.rs
@@ -24,10 +24,6 @@ pub use self::PpSourceMode::*;
 pub use self::PpMode::*;
 use crate::abort_on_err;
 
-use crate::source_name;
-
-
-
 // This slightly awkward construction is to allow for each PpMode to
 // choose whether it needs to do analyses (which can consume the
 // Session) and then pass through the session (now attached to the
@@ -391,7 +387,7 @@ impl<'a, 'tcx> pprust_hir::PpAnn for TypedAnnotation<'a, 'tcx> {
 }
 
 fn get_source(input: &Input, sess: &Session) -> (String, FileName) {
-    let src_name = source_name(input);
+    let src_name = input.source_name();
     let src = String::clone(&sess.source_map()
         .get_source_file(&src_name)
         .unwrap()