mv proc_macro::SourceFile proc_macro::OriginalSourceFile

Author: dsciarra

src/libproc_macro/lib.rs

@@ -306,8 +306,8 @@ impl Span {
 
     /// The original source file into which this span points.
     #[unstable(feature = "proc_macro_span", issue = "38356")]
-    pub fn source_file(&self) -> SourceFile {
-        SourceFile {
+    pub fn original_source_file(&self) -> OriginalSourceFile {
+        OriginalSourceFile {
             filemap: __internal::lookup_char_pos(self.0.lo()).file,
         }
     }
@@ -418,20 +418,20 @@ impl !Sync for LineColumn {}
 /// The source file of a given `Span`.
 #[unstable(feature = "proc_macro_span", issue = "38356")]
 #[derive(Clone)]
-pub struct SourceFile {
+pub struct OriginalSourceFile {
     filemap: Lrc<FileMap>,
 }
 
 #[unstable(feature = "proc_macro_span", issue = "38356")]
-impl !Send for SourceFile {}
+impl !Send for OriginalSourceFile {}
 #[unstable(feature = "proc_macro_span", issue = "38356")]
-impl !Sync for SourceFile {}
+impl !Sync for OriginalSourceFile {}
 
-impl SourceFile {
+impl OriginalSourceFile {
     /// Get the path to this source file.
     ///
     /// ### Note
-    /// If the code span associated with this `SourceFile` was generated by an external macro, this
+    /// If the code span associated with this `OriginalSourceFile` was generated by an external macro, this
     /// may not be an actual path on the filesystem. Use [`is_real`] to check.
     ///
     /// Also note that even if `is_real` returns `true`, if `--remap-path-prefix` was passed on
@@ -459,24 +459,24 @@ impl SourceFile {
 
 
 #[unstable(feature = "proc_macro_span", issue = "38356")]
-impl fmt::Debug for SourceFile {
+impl fmt::Debug for OriginalSourceFile {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("SourceFile")
+        f.debug_struct("OriginalSourceFile")
             .field("path", &self.path())
             .field("is_real", &self.is_real())
             .finish()
     }
 }
 
 #[unstable(feature = "proc_macro_span", issue = "38356")]
-impl PartialEq for SourceFile {
+impl PartialEq for OriginalSourceFile {
     fn eq(&self, other: &Self) -> bool {
         Lrc::ptr_eq(&self.filemap, &other.filemap)
     }
 }
 
 #[unstable(feature = "proc_macro_span", issue = "38356")]
-impl Eq for SourceFile {}
+impl Eq for OriginalSourceFile {}
 
 /// A single token or a delimited sequence of token trees (e.g. `[1, (), ..]`).
 #[stable(feature = "proc_macro_lib2", since = "1.29.0")]

src/test/run-pass-fulldeps/proc-macro/auxiliary/span-api-tests.rs

@@ -27,7 +27,7 @@ pub fn reemit(input: TokenStream) -> TokenStream {
 #[proc_macro]
 pub fn assert_fake_source_file(input: TokenStream) -> TokenStream {
     for tk in input {
-        let source_file = tk.span().source_file();
+        let source_file = tk.span().original_source_file();
         assert!(!source_file.is_real(), "Source file is real: {:?}", source_file);
     }
 
@@ -37,7 +37,7 @@ pub fn assert_fake_source_file(input: TokenStream) -> TokenStream {
 #[proc_macro]
 pub fn assert_source_file(input: TokenStream) -> TokenStream {
     for tk in input {
-        let source_file = tk.span().source_file();
+        let source_file = tk.span().original_source_file();
         assert!(source_file.is_real(), "Source file is not real: {:?}", source_file);
     }