Skip to content

Commit 303d2f2

Browse files
committed
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
1 parent 2cad8bb commit 303d2f2

File tree

2 files changed

+1
-12
lines changed

2 files changed

+1
-12
lines changed

src/librustc_driver/lib.rs

-7
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,6 @@ const ICE_REPORT_COMPILER_FLAGS_EXCLUDE: &[&str] = &["metadata", "extra-filename
8484

8585
const ICE_REPORT_COMPILER_FLAGS_STRIP_VALUE: &[&str] = &["incremental"];
8686

87-
pub fn source_name(input: &Input) -> FileName {
88-
match *input {
89-
Input::File(ref ifile) => ifile.clone().into(),
90-
Input::Str { ref name, .. } => name.clone(),
91-
}
92-
}
93-
9487
pub fn abort_on_err<T>(result: Result<T, ErrorReported>, sess: &Session) -> T {
9588
match result {
9689
Err(..) => {

src/librustc_driver/pretty.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ pub use self::PpSourceMode::*;
2424
pub use self::PpMode::*;
2525
use crate::abort_on_err;
2626

27-
use crate::source_name;
28-
29-
30-
3127
// This slightly awkward construction is to allow for each PpMode to
3228
// choose whether it needs to do analyses (which can consume the
3329
// 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> {
391387
}
392388

393389
fn get_source(input: &Input, sess: &Session) -> (String, FileName) {
394-
let src_name = source_name(input);
390+
let src_name = input.source_name();
395391
let src = String::clone(&sess.source_map()
396392
.get_source_file(&src_name)
397393
.unwrap()

0 commit comments

Comments
 (0)