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_parse/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_parse/src')
| -rw-r--r-- | compiler/rustc_parse/src/parser/diagnostics.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_parse/src/parser/expr.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_parse/src/parser/mod.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_parse/src/parser/diagnostics.rs b/compiler/rustc_parse/src/parser/diagnostics.rs index 534fd0d4816..8f64d6d732f 100644 --- a/compiler/rustc_parse/src/parser/diagnostics.rs +++ b/compiler/rustc_parse/src/parser/diagnostics.rs @@ -203,7 +203,7 @@ impl<'a> Parser<'a> { &self.sess.span_diagnostic } - /// Relace `self` with `snapshot.parser` and extend `unclosed_delims` with `snapshot.unclosed_delims`. + /// Replace `self` with `snapshot.parser` and extend `unclosed_delims` with `snapshot.unclosed_delims`. /// This is to avoid losing unclosed delims errors `create_snapshot_for_diagnostic` clears. pub(super) fn restore_snapshot(&mut self, snapshot: SnapshotParser<'a>) { *self = snapshot.parser; diff --git a/compiler/rustc_parse/src/parser/expr.rs b/compiler/rustc_parse/src/parser/expr.rs index 148e0a24ec3..a970d180b1a 100644 --- a/compiler/rustc_parse/src/parser/expr.rs +++ b/compiler/rustc_parse/src/parser/expr.rs @@ -276,7 +276,7 @@ impl<'a> Parser<'a> { lhs = self.parse_assoc_op_ascribe(lhs, lhs_span)?; continue; } else if op == AssocOp::DotDot || op == AssocOp::DotDotEq { - // If we didn’t have to handle `x..`/`x..=`, it would be pretty easy to + // If we didn't have to handle `x..`/`x..=`, it would be pretty easy to // generalise it to the Fixity::None code. lhs = self.parse_range_expr(prec, lhs, op, cur_op_span)?; break; diff --git a/compiler/rustc_parse/src/parser/mod.rs b/compiler/rustc_parse/src/parser/mod.rs index 5d244ef9118..b242c1e050d 100644 --- a/compiler/rustc_parse/src/parser/mod.rs +++ b/compiler/rustc_parse/src/parser/mod.rs @@ -150,7 +150,7 @@ pub struct Parser<'a> { pub current_closure: Option<ClosureSpans>, } -/// Stores span informations about a closure. +/// Stores span information about a closure. #[derive(Clone)] pub struct ClosureSpans { pub whole_closure: Span, |