diff options
| author | bors <bors@rust-lang.org> | 2020-06-26 22:42:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-06-26 22:42:44 +0000 |
| commit | dda8a7fde92a0be3f18b863bf35bebf195f8ed5c (patch) | |
| tree | e48a9f031be0e9b623e40396c4f711d934058bae /src/test | |
| parent | 7750c3d46bc19784adb1ee6e37a5ec7e4cd7e772 (diff) | |
| parent | 7b2064f4f969062312ec3144e7901ea7b6be5b62 (diff) | |
| download | rust-dda8a7fde92a0be3f18b863bf35bebf195f8ed5c.tar.gz rust-dda8a7fde92a0be3f18b863bf35bebf195f8ed5c.zip | |
Auto merge of #73596 - petrochenkov:shebang2, r=Mark-Simulacrum
rustc_lexer: Simplify shebang parsing once more Fixes https://github.com/rust-lang/rust/issues/73250 (beta regression) Treat any line starting with `!#` as a shebang candidate, not only lines with something non-whitespace. This way we no longer need to define what `is_whitespace` means ([Linux shebang whitespace](https://github.com/torvalds/linux/blob/master/fs/binfmt_script.c), ASCII whitespace, Rust lexer whitespace, etc), which is nice. This change makes some invalid Rust code valid (see the regression above), but still never interprets a fragment of valid Rust code as a shebang. (This PR also removes one duplicate test.)
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/ui/parser/shebang/shebang-empty.rs | 4 | ||||
| -rw-r--r-- | src/test/ui/parser/shebang/shebang-space.rs | 5 | ||||
| -rw-r--r-- | src/test/ui/shebang.rs | 5 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/test/ui/parser/shebang/shebang-empty.rs b/src/test/ui/parser/shebang/shebang-empty.rs new file mode 100644 index 00000000000..e38cc637e94 --- /dev/null +++ b/src/test/ui/parser/shebang/shebang-empty.rs @@ -0,0 +1,4 @@ +#! + +// check-pass +fn main() {} diff --git a/src/test/ui/parser/shebang/shebang-space.rs b/src/test/ui/parser/shebang/shebang-space.rs new file mode 100644 index 00000000000..0978b759d2a --- /dev/null +++ b/src/test/ui/parser/shebang/shebang-space.rs @@ -0,0 +1,5 @@ +#! + +// check-pass +// ignore-tidy-end-whitespace +fn main() {} diff --git a/src/test/ui/shebang.rs b/src/test/ui/shebang.rs deleted file mode 100644 index 3d3ba468be9..00000000000 --- a/src/test/ui/shebang.rs +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env rustx - -// run-pass - -pub fn main() { println!("Hello World"); } |
