From 4d67c8da5563f7398dd7373b24bccd46c96ebb77 Mon Sep 17 00:00:00 2001 From: Eduard-Mihai Burtescu Date: Tue, 28 Apr 2020 13:02:58 +0300 Subject: [PATCH] Revert "Rollup merge of #71372 - ayushmishra2005:shebang_stripping, r=estebank" This reverts commit 46a8dcef5c9e4de0d412c6ac3c4765cb4aef4f7f, reversing changes made to f28e3873c55eb4bdcfc496e1f300b97aeb0d189c. --- src/librustc_lexer/src/lib.rs | 7 +------ src/librustc_lexer/src/tests.rs | 18 ------------------ 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/src/librustc_lexer/src/lib.rs b/src/librustc_lexer/src/lib.rs index be85a34bd395a..5ccfc1b276bfa 100644 --- a/src/librustc_lexer/src/lib.rs +++ b/src/librustc_lexer/src/lib.rs @@ -236,17 +236,12 @@ pub enum Base { /// (e.g. "#![deny(missing_docs)]"). pub fn strip_shebang(input: &str) -> Option { debug_assert!(!input.is_empty()); - let s: &str = &remove_whitespace(input); - if !s.starts_with("#!") || s.starts_with("#![") { + if !input.starts_with("#!") || input.starts_with("#![") { return None; } Some(input.find('\n').unwrap_or(input.len())) } -fn remove_whitespace(s: &str) -> String { - s.chars().filter(|c| !c.is_whitespace()).collect() -} - /// Parses the first token from the provided input string. pub fn first_token(input: &str) -> Token { debug_assert!(!input.is_empty()); diff --git a/src/librustc_lexer/src/tests.rs b/src/librustc_lexer/src/tests.rs index 065e8f3f646fb..06fc159fe2516 100644 --- a/src/librustc_lexer/src/tests.rs +++ b/src/librustc_lexer/src/tests.rs @@ -145,22 +145,4 @@ mod tests { }), ); } - - #[test] - fn test_valid_shebang() { - // https://github.com/rust-lang/rust/issues/70528 - let input = "#!/usr/bin/rustrun"; - let actual = strip_shebang(input); - let expected: Option = Some(18); - assert_eq!(expected, actual); - } - - #[test] - fn test_invalid_shebang_valid_rust_syntax() { - // https://github.com/rust-lang/rust/issues/70528 - let input = "#! [bad_attribute]"; - let actual = strip_shebang(input); - let expected: Option = None; - assert_eq!(expected, actual); - } }