diff options
| author | bors <bors@rust-lang.org> | 2021-02-23 17:24:33 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-02-23 17:24:33 +0000 |
| commit | fe1bf8e05c39bdcc73fc09e246b7209444e389bc (patch) | |
| tree | 9265dd81347434a5b0b6785222fa0b5901e43a1e /compiler/rustc_span/src | |
| parent | 019610754363d1d92a8d0f364d2c0909d6f53dfd (diff) | |
| parent | 51511c75b558beddab7fb4b6d8277a872714b87a (diff) | |
| download | rust-fe1bf8e05c39bdcc73fc09e246b7209444e389bc.tar.gz rust-fe1bf8e05c39bdcc73fc09e246b7209444e389bc.zip | |
Auto merge of #82443 - Dylan-DPC:rollup-yni7uio, r=Dylan-DPC
Rollup of 10 pull requests Successful merges: - #81629 (Point out implicit deref coercions in borrow) - #82113 (Improve non_fmt_panic lint.) - #82258 (Implement -Z hir-stats for nested foreign items) - #82296 (Support `pub` on `macro_rules`) - #82297 (Consider auto derefs before warning about write only fields) - #82305 (Remove many RefCells from DocContext) - #82308 (Lower condition of `if` expression before it's "then" block) - #82311 (Jsondocck improvements) - #82362 (Fix mir-cfg dumps) - #82391 (disable atomic_max/min tests in Miri) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_span/src')
| -rw-r--r-- | compiler/rustc_span/src/symbol.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/rustc_span/src/symbol.rs b/compiler/rustc_span/src/symbol.rs index 4ed0262bf2c..b112402ffe3 100644 --- a/compiler/rustc_span/src/symbol.rs +++ b/compiler/rustc_span/src/symbol.rs @@ -560,6 +560,7 @@ symbols! { format_args, format_args_capture, format_args_nl, + format_macro, freeze, freg, frem_fast, @@ -880,6 +881,7 @@ symbols! { ptr_guaranteed_eq, ptr_guaranteed_ne, ptr_offset_from, + pub_macro_rules, pub_restricted, pure, pushpop_unsafe, |