-
-
Notifications
You must be signed in to change notification settings - Fork 307
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #876 from dtolnay/shebang
Match rustc's new shebang handling
- Loading branch information
Showing
3 changed files
with
137 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
pub fn skip(mut s: &str) -> &str { | ||
'skip: while !s.is_empty() { | ||
let byte = s.as_bytes()[0]; | ||
if byte == b'/' { | ||
if s.starts_with("//") | ||
&& (!s.starts_with("///") || s.starts_with("////")) | ||
&& !s.starts_with("//!") | ||
{ | ||
if let Some(i) = s.find('\n') { | ||
s = &s[i + 1..]; | ||
continue; | ||
} else { | ||
return ""; | ||
} | ||
} else if s.starts_with("/**/") { | ||
s = &s[4..]; | ||
continue; | ||
} else if s.starts_with("/*") | ||
&& (!s.starts_with("/**") || s.starts_with("/***")) | ||
&& !s.starts_with("/*!") | ||
{ | ||
let mut depth = 0; | ||
let bytes = s.as_bytes(); | ||
let mut i = 0; | ||
let upper = bytes.len() - 1; | ||
while i < upper { | ||
if bytes[i] == b'/' && bytes[i + 1] == b'*' { | ||
depth += 1; | ||
i += 1; // eat '*' | ||
} else if bytes[i] == b'*' && bytes[i + 1] == b'/' { | ||
depth -= 1; | ||
if depth == 0 { | ||
s = &s[i + 2..]; | ||
continue 'skip; | ||
} | ||
i += 1; // eat '/' | ||
} | ||
i += 1; | ||
} | ||
return s; | ||
} | ||
} | ||
match byte { | ||
b' ' | 0x09..=0x0d => { | ||
s = &s[1..]; | ||
continue; | ||
} | ||
b if b <= 0x7f => {} | ||
_ => { | ||
let ch = s.chars().next().unwrap(); | ||
if is_whitespace(ch) { | ||
s = &s[ch.len_utf8()..]; | ||
continue; | ||
} | ||
} | ||
} | ||
return s; | ||
} | ||
s | ||
} | ||
|
||
fn is_whitespace(ch: char) -> bool { | ||
// Rust treats left-to-right mark and right-to-left mark as whitespace | ||
ch.is_whitespace() || ch == '\u{200e}' || ch == '\u{200f}' | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
#[macro_use] | ||
mod macros; | ||
|
||
#[test] | ||
fn test_basic() { | ||
let content = "#!/usr/bin/env rustx\nfn main() {}"; | ||
let file = syn::parse_file(content).unwrap(); | ||
snapshot!(file, @r###" | ||
File { | ||
shebang: Some("#!/usr/bin/env rustx"), | ||
items: [ | ||
Item::Fn { | ||
vis: Inherited, | ||
sig: Signature { | ||
ident: "main", | ||
generics: Generics, | ||
output: Default, | ||
}, | ||
block: Block, | ||
}, | ||
], | ||
} | ||
"###); | ||
} | ||
|
||
#[test] | ||
fn test_comment() { | ||
let content = "#!//am/i/a/comment\n[allow(dead_code)] fn main() {}"; | ||
let file = syn::parse_file(content).unwrap(); | ||
snapshot!(file, @r###" | ||
File { | ||
attrs: [ | ||
Attribute { | ||
style: Inner, | ||
path: Path { | ||
segments: [ | ||
PathSegment { | ||
ident: "allow", | ||
arguments: None, | ||
}, | ||
], | ||
}, | ||
tokens: TokenStream(`( dead_code )`), | ||
}, | ||
], | ||
items: [ | ||
Item::Fn { | ||
vis: Inherited, | ||
sig: Signature { | ||
ident: "main", | ||
generics: Generics, | ||
output: Default, | ||
}, | ||
block: Block, | ||
}, | ||
], | ||
} | ||
"###); | ||
} |