diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2016-02-03 02:54:24 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2016-02-03 02:54:24 +0530 |
| commit | 76e00250788e81a639508fd98b04a0932af0bb2c (patch) | |
| tree | fd79e388f022e3414e21366442963054691c51cf /src/libsyntax | |
| parent | 59b7c907a3e3dd8b263297adf6ff0515fac125e3 (diff) | |
| parent | 1a8cdc0f2f6a9f513cefbed36e5f57c1c45b8039 (diff) | |
| download | rust-76e00250788e81a639508fd98b04a0932af0bb2c.tar.gz rust-76e00250788e81a639508fd98b04a0932af0bb2c.zip | |
Rollup merge of #27499 - barosl:macro-doc-raw-str-hashes, r=nikomatsakis
Any documentation comments that contain raw-string-looking sequences may pretty-print invalid code when expanding them, as the current logic always uses the `r"literal"` form, without appending any `#`s. This commit calculates the minimum number of `#`s required to wrap a comment correctly and appends `#`s appropriately. Fixes #27489.
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ast.rs | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index 19bedab9d30..088f911ed8c 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -1174,6 +1174,20 @@ impl TokenTree { } (&TokenTree::Token(sp, token::DocComment(name)), _) => { let stripped = strip_doc_comment_decoration(&name.as_str()); + + // Searches for the occurrences of `"#*` and returns the minimum number of `#`s + // required to wrap the text. + let num_of_hashes = stripped.chars().scan(0, |cnt, x| { + *cnt = if x == '"' { + 1 + } else if *cnt != 0 && x == '#' { + *cnt + 1 + } else { + 0 + }; + Some(*cnt) + }).max().unwrap_or(0); + TokenTree::Delimited(sp, Rc::new(Delimited { delim: token::Bracket, open_span: sp, @@ -1181,7 +1195,7 @@ impl TokenTree { token::Plain)), TokenTree::Token(sp, token::Eq), TokenTree::Token(sp, token::Literal( - token::StrRaw(token::intern(&stripped), 0), None))], + token::StrRaw(token::intern(&stripped), num_of_hashes), None))], close_span: sp, })) } |
