rustc_ast_pretty: Don't print space after $

For example, this code:

    $arg:expr

used to be pretty-printed as:

    $ arg : expr

but is now pretty-printed as:

    $arg : expr
This commit is contained in:
Noah Lev 2021-07-03 15:10:06 -07:00
parent f82d4845f2
commit 7ffec7028a
11 changed files with 32 additions and 28 deletions

View file

@ -136,11 +136,11 @@ pub fn print_crate<'a>(
s.s.eof()
}
// This makes printed token streams look slightly nicer,
// and also addresses some specific regressions described in #63896 and #73345.
/// This makes printed token streams look slightly nicer,
/// and also addresses some specific regressions described in #63896 and #73345.
fn tt_prepend_space(tt: &TokenTree, prev: &TokenTree) -> bool {
if let TokenTree::Token(token) = prev {
if matches!(token.kind, token::Dot) {
if matches!(token.kind, token::Dot | token::Dollar) {
return false;
}
if let token::DocComment(comment_kind, ..) = token.kind {

View file

@ -11,9 +11,9 @@ macro_rules! matcher_brackets {
}
macro_rules! all_fragments {
($ b : block, $ e : expr, $ i : ident, $ it : item, $ l : lifetime, $ lit
: literal, $ m : meta, $ p : pat, $ pth : path, $ s : stmt, $ tt : tt, $
ty : ty, $ vis : vis) => { } ;
($b : block, $e : expr, $i : ident, $it : item, $l : lifetime, $lit :
literal, $m : meta, $p : pat, $pth : path, $s : stmt, $tt : tt, $ty : ty,
$vis : vis) => { } ;
}
fn main() { }

View file

@ -14,10 +14,12 @@
// @has - '//span[@class="op"]' '>'
// @has - '{ ... };'
// @has - '($ ($'
// @has - '//span[@class="ident"]' 'arg'
// @has - '($('
// @has - '//span[@class="macro-nonterminal"]' '$'
// @has - '//span[@class="macro-nonterminal"]' 'arg'
// @has - ':'
// @has - '//span[@class="ident"]' 'tt'
// @has - '),'
// @has - '//span[@class="op"]' '+'
// @has - ')'
pub use std::todo;
@ -28,9 +30,11 @@ mod mod1 {
// @has - 'macro1'
// @has - '{ ()'
// @has - '($('
// @has - 'arg'
// @has - '//span[@class="macro-nonterminal"]' '$'
// @has - '//span[@class="macro-nonterminal"]' 'arg'
// @has - ':'
// @has - 'expr'
// @has - ','
// @has - '),'
// @has - '+'
// @has - ')'
#[macro_export]