diff options
| author | bors <bors@rust-lang.org> | 2022-03-31 05:12:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-03-31 05:12:45 +0000 |
| commit | ffaf6f0d0ccfbc76da00baded073d10f05ffcbd1 (patch) | |
| tree | c52a1a6ff3a746fa75dc69b5edd1a15c7dfcfaae /compiler/rustc_span/src | |
| parent | a39ac5ae175e0f9f910b1800a430b488ec0f2105 (diff) | |
| parent | 1b7d6dbd3043a002279e9ebafc0b082f4d891200 (diff) | |
| download | rust-ffaf6f0d0ccfbc76da00baded073d10f05ffcbd1.tar.gz rust-ffaf6f0d0ccfbc76da00baded073d10f05ffcbd1.zip | |
Auto merge of #95506 - Dylan-DPC:rollup-b6kxzjc, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #95130 (Stabilize thread::is_finished) - #95263 (Restore `impl Future<Output = Type>` to async blocks) - #95471 (Don't ICE when opaque types get their hidden type constrained again.) - #95491 (Stabilize feature vec_retain_mut on Vec and VecDeque) - #95497 (Spellchecking compiler comments) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_span/src')
| -rw-r--r-- | compiler/rustc_span/src/hygiene.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_span/src/symbol.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_span/src/hygiene.rs b/compiler/rustc_span/src/hygiene.rs index 86adfa7a18c..937e0cf045a 100644 --- a/compiler/rustc_span/src/hygiene.rs +++ b/compiler/rustc_span/src/hygiene.rs @@ -1177,7 +1177,7 @@ pub struct HygieneEncodeContext { /// that we don't accidentally try to encode any more `SyntaxContexts` serialized_ctxts: Lock<FxHashSet<SyntaxContext>>, /// The `SyntaxContexts` that we have serialized (e.g. as a result of encoding `Spans`) - /// in the most recent 'round' of serializnig. Serializing `SyntaxContextData` + /// in the most recent 'round' of serializing. Serializing `SyntaxContextData` /// may cause us to serialize more `SyntaxContext`s, so serialize in a loop /// until we reach a fixed point. latest_ctxts: Lock<FxHashSet<SyntaxContext>>, diff --git a/compiler/rustc_span/src/symbol.rs b/compiler/rustc_span/src/symbol.rs index 0bca0a99e15..2737c26708b 100644 --- a/compiler/rustc_span/src/symbol.rs +++ b/compiler/rustc_span/src/symbol.rs @@ -1638,7 +1638,7 @@ impl fmt::Display for Ident { /// hygiene data, most importantly name of the crate it refers to. /// As a result we print `$crate` as `crate` if it refers to the local crate /// and as `::other_crate_name` if it refers to some other crate. -/// Note, that this is only done if the ident token is printed from inside of AST pretty-pringing, +/// Note, that this is only done if the ident token is printed from inside of AST pretty-printing, /// but not otherwise. Pretty-printing is the only way for proc macros to discover token contents, /// so we should not perform this lossy conversion if the top level call to the pretty-printer was /// done for a token stream or a single token. @@ -1813,7 +1813,7 @@ pub(crate) struct Interner(Lock<InternerInner>); // revisited after further improvements to `indexmap`. // // This type is private to prevent accidentally constructing more than one -// `Interner` on the same thread, which makes it easy to mixup `Symbol`s +// `Interner` on the same thread, which makes it easy to mix up `Symbol`s // between `Interner`s. #[derive(Default)] struct InternerInner { |