]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #62393 - petrochenkov:notto-disu, r=Mark-Simulacrum
authorMazdak Farrokhzad <twingoow@gmail.com>
Wed, 10 Jul 2019 03:14:09 +0000 (05:14 +0200)
committerGitHub <noreply@github.com>
Wed, 10 Jul 2019 03:14:09 +0000 (05:14 +0200)
Fix pretty-printing of `$crate` (take 4)

Pretty-print `$crate` as `crate` or `crate_name` in unstructured tokens like `a $crate c` in `foo!(a $crate c)`, but only if those tokens are printed as a part of AST pretty-printing, rather than as a standalone token stream.

Fixes https://github.com/rust-lang/rust/issues/62325
Previous iterations - https://github.com/rust-lang/rust/pull/56647, https://github.com/rust-lang/rust/pull/57155, https://github.com/rust-lang/rust/pull/57915.


Trivial merge