mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #115304 - Enselic:trailing-gt, r=cjgillot

Browse Source 
Allow file names to end with '>'

The [`rustc_span::FileName`](https://doc.rust-lang.org/stable/nightly-rustc/rustc_span/enum.FileName.html) enum already differentiates between real files and "fake" files such as `<anon>`. We do not need to artificially forbid real file names from ending in `>`.

Closes #73419
This commit is contained in:
bors 2023-10-06 14:57:09 +00:00
commit 64fa0c34d7
4 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compiler/rustc_span/src/lib.rs
View File

@ -305,7 +305,6 @@ pub enum FileName {
impl From<PathBuf> for FileName {
fn from(p: PathBuf) -> Self {
assert!(!p.to_string_lossy().ends_with('>'));
FileName::Real(RealFileName::LocalPath(p))
}
}

18
tests/run-make/silly-file-names/Makefile Normal file
View File

@ -0,0 +1,18 @@
# ignore-cross-compile we need to execute the binary
# ignore-windows we create files with < and > in their names
include ../tools.mk
ifdef RUSTC_BLESS_TEST
RUSTC_TEST_OP = cp
else
RUSTC_TEST_OP = $(DIFF)
endif
all:
echo '"comes from a file with a name that begins with <"' > "$(TMPDIR)/<leading-lt"
echo '"comes from a file with a name that ends with >"' > "$(TMPDIR)/trailing-gt>"
cp silly-file-names.rs "$(TMPDIR)/silly-file-names.rs"
$(RUSTC) "$(TMPDIR)/silly-file-names.rs" -o "$(TMPDIR)/silly-file-names"
"$(TMPDIR)/silly-file-names" > "$(TMPDIR)/silly-file-names.run.stdout"
$(RUSTC_TEST_OP) "$(TMPDIR)/silly-file-names.run.stdout" silly-file-names.run.stdout

4
tests/run-make/silly-file-names/silly-file-names.rs Normal file
View File

@ -0,0 +1,4 @@
fn main() {
println!(include!("<leading-lt"));
println!(include!("trailing-gt>"));
}

2
tests/run-make/silly-file-names/silly-file-names.run.stdout Normal file
View File

@ -0,0 +1,2 @@
comes from a file with a name that begins with <
comes from a file with a name that ends with >