diff options
| author | bors <bors@rust-lang.org> | 2021-12-07 11:18:26 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-12-07 11:18:26 +0000 |
| commit | c5c94945096265b6d675b2f55a247c4799de8d87 (patch) | |
| tree | db23a9bb573dcc1e2d8bdf2801585803b5a7d99c /compiler/rustc_span/src | |
| parent | c67497a5da33eb3167a33e938920ce04d2b883a5 (diff) | |
| parent | 099412ee0e3a46592ff952ab9fd78087cc0ed0b0 (diff) | |
| download | rust-c5c94945096265b6d675b2f55a247c4799de8d87.tar.gz rust-c5c94945096265b6d675b2f55a247c4799de8d87.zip | |
Auto merge of #91627 - matthiaskrgr:rollup-z3e2peg, r=matthiaskrgr
Rollup of 10 pull requests
Successful merges:
- #87614 (Recommend fix `count()` -> `len()` on slices)
- #91065 (Add test for evaluate_obligation: Ok(EvaluatedToOkModuloRegions) ICE)
- #91312 (Fix AnonConst ICE)
- #91341 (Add `array::IntoIter::{empty, from_raw_parts}`)
- #91493 (Remove a dead code path.)
- #91503 (Tweak "call this function" suggestion to have smaller span)
- #91547 (Suggest try_reserve in try_reserve_exact)
- #91562 (Pretty print async block without redundant space)
- #91620 (Update books)
- #91622 (:arrow_up: rust-analyzer)
Failed merges:
- #91571 (Remove unneeded access to pretty printer's `s` field in favor of deref)
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_span/src')
| -rw-r--r-- | compiler/rustc_span/src/symbol.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/rustc_span/src/symbol.rs b/compiler/rustc_span/src/symbol.rs index 309c305293f..49947cc1fa4 100644 --- a/compiler/rustc_span/src/symbol.rs +++ b/compiler/rustc_span/src/symbol.rs @@ -499,6 +499,7 @@ symbols! { core_panic_macro, cosf32, cosf64, + count, cr, crate_id, crate_in_paths, |