This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 669c1ab

committed

Auto merge of rust-lang#140514 - m-ou-se:proc-macro-span-file, r=Amanieu

Stabilize proc_macro::Span::{file, local_file}. Stabilizes this part of rust-lang#54725: ```rust impl Span { pub fn file(&self) -> String; // Mapped/artificial file name, for display purposes. pub fn local_file(&self) -> Option<PathBuf>; // Real file name as it exists on the local file system. } ``` See also the naming discussion in rust-lang#139903

2 parents 27d6200 + 2a053c7 commit 669c1abCopy full SHA for 669c1ab

File tree

1 file changed

-4

lines changed

library/proc_macro/src
- lib.rs

1 file changed

-4

lines changed

`‎library/proc_macro/src/lib.rs`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -543,18 +543,18 @@ impl Span {`
`543`	`543`	`/// The path to the source file in which this span occurs, for display purposes.`
`544`	`544`	`///`
`545`	`545`	`/// This might not correspond to a valid file system path.`
`546`		- /// It might be remapped, or might be an artificial path such as `"<macro expansion>"`.
`547`		`- #[unstable(feature = "proc_macro_span", issue = "54725")]`
	`546`	+ /// It might be remapped (e.g. `"/src/lib.rs"`) or an artificial path (e.g. `"<command line>"`).
	`547`	`+ #[stable(feature = "proc_macro_span_file", since = "CURRENT_RUSTC_VERSION")]`
`548`	`548`	`pub fn file(&self) -> String {`
`549`	`549`	`self.0.file()`
`550`	`550`	`}`
`551`	`551`
`552`		`- /// The path to the source file in which this span occurs on disk.`
	`552`	`+ /// The path to the source file in which this span occurs on the local file system.`
`553`	`553`	`///`
`554`	`554`	`/// This is the actual path on disk. It is unaffected by path remapping.`
`555`	`555`	`///`
`556`	`556`	/// This path should not be embedded in the output of the macro; prefer `file()` instead.
`557`		`- #[unstable(feature = "proc_macro_span", issue = "54725")]`
	`557`	`+ #[stable(feature = "proc_macro_span_file", since = "CURRENT_RUSTC_VERSION")]`
`558`	`558`	`pub fn local_file(&self) -> Option<PathBuf> {`
`559`	`559`	`self.0.local_file().map(\|s\| PathBuf::from(s))`
`560`	`560`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 669c1ab

File tree

1 file changed

1 file changed

`‎library/proc_macro/src/lib.rs`

0 commit comments