Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 01fc5a7

Browse files
authored
Rollup merge of rust-lang#108694 - est31:backticks_matchmaking_comments, r=Nilstrieb
Match unmatched backticks in compiler/ comments r? ``@Nilstrieb`` as per [advice](rust-lang#108685 (comment))
2 parents 846424d + 6df5ae4 commit 01fc5a7

File tree

42 files changed

+51
-48
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+51
-48
lines changed

compiler/rustc_ast/src/util/parser.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ impl AssocOp {
225225
AssignOp(_) | // `{ 42 } +=`
226226
As | // `{ 42 } as usize`
227227
// Equal | // `{ 42 } == { 42 }` Accepting these here would regress incorrect
228-
// NotEqual | // `{ 42 } != { 42 } struct literals parser recovery.
228+
// NotEqual | // `{ 42 } != { 42 }` struct literals parser recovery.
229229
Colon, // `{ 42 }: usize`
230230
)
231231
}

compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1607,7 +1607,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
16071607
hir::OwnerNode::Item(self.arena.alloc(opaque_ty_item))
16081608
}
16091609

1610-
/// Given a `parent_def_id`, a list of `lifetimes_in_bounds and a `remapping` hash to be
1610+
/// Given a `parent_def_id`, a list of `lifetimes_in_bounds` and a `remapping` hash to be
16111611
/// filled, this function creates new definitions for `Param` and `Fresh` lifetimes, inserts the
16121612
/// new definition, adds it to the remapping with the definition of the given lifetime and
16131613
/// returns a list of lifetimes to be lowered afterwards.

compiler/rustc_ast_passes/src/ast_validation.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ impl<'a> AstValidator<'a> {
192192
// We allow these:
193193
// - `Option<impl Trait>`
194194
// - `option::Option<impl Trait>`
195-
// - `option::Option<T>::Foo<impl Trait>
195+
// - `option::Option<T>::Foo<impl Trait>`
196196
//
197197
// But not these:
198198
// - `<impl Trait>::Foo`

compiler/rustc_borrowck/src/diagnostics/region_errors.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
415415
/// fn foo<'a, 'b>(x: &'a u32) -> &'b u32 { x }
416416
/// ```
417417
///
418-
/// Here we would be invoked with `fr = 'a` and `outlived_fr = `'b`.
418+
/// Here we would be invoked with `fr = 'a` and `outlived_fr = 'b`.
419419
pub(crate) fn report_region_error(
420420
&mut self,
421421
fr: RegionVid,

compiler/rustc_borrowck/src/region_infer/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
889889
/// from a universe it can't name; at present, the only way for
890890
/// this to be true is if `scc` outlives `'static`. This is
891891
/// actually stricter than necessary: ideally, we'd support bounds
892-
/// like `for<'a: 'b`>` that might then allow us to approximate
892+
/// like `for<'a: 'b>` that might then allow us to approximate
893893
/// `'a` with `'b` and not `'static`. But it will have to do for
894894
/// now.
895895
fn add_incompatible_universe(&mut self, scc: ConstraintSccIndex) {

compiler/rustc_borrowck/src/region_infer/values.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ pub(crate) struct RegionValues<N: Idx> {
235235
free_regions: SparseBitMatrix<N, RegionVid>,
236236

237237
/// Placeholders represent bound regions -- so something like `'a`
238-
/// in for<'a> fn(&'a u32)`.
238+
/// in `for<'a> fn(&'a u32)`.
239239
placeholders: SparseBitMatrix<N, PlaceholderIndex>,
240240
}
241241

compiler/rustc_hir_analysis/src/check/compare_impl_item.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1873,7 +1873,7 @@ pub(super) fn check_type_bounds<'tcx>(
18731873
// type Bar<C> =...
18741874
// }
18751875
//
1876-
// - `impl_trait_ref` would be `<(A, B) as Foo<u32>>
1876+
// - `impl_trait_ref` would be `<(A, B) as Foo<u32>>`
18771877
// - `impl_ty_substs` would be `[A, B, ^0.0]` (`^0.0` here is the bound var with db 0 and index 0)
18781878
// - `rebased_substs` would be `[(A, B), u32, ^0.0]`, combining the substs from
18791879
// the *trait* with the generic associated type parameters (as bound vars).

compiler/rustc_hir_analysis/src/coherence/builtin.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ pub fn coerce_unsized_info<'tcx>(tcx: TyCtxt<'tcx>, impl_did: DefId) -> CoerceUn
437437
}
438438

439439
// Here we are considering a case of converting
440-
// `S<P0...Pn>` to S<Q0...Qn>`. As an example, let's imagine a struct `Foo<T, U>`,
440+
// `S<P0...Pn>` to `S<Q0...Qn>`. As an example, let's imagine a struct `Foo<T, U>`,
441441
// which acts like a pointer to `U`, but carries along some extra data of type `T`:
442442
//
443443
// struct Foo<T, U> {

compiler/rustc_hir_typeck/src/mem_categorization.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ impl<'a, 'tcx> MemCategorizationContext<'a, 'tcx> {
636636
// `&&Some(x,)` `place_foo`
637637
// `&Some(x,)` `deref { place_foo}`
638638
// `Some(x,)` `deref { deref { place_foo }}`
639-
// (x,)` `field0 { deref { deref { place_foo }}}` <- resulting place
639+
// `(x,)` `field0 { deref { deref { place_foo }}}` <- resulting place
640640
//
641641
// The above example has no adjustments. If the code were instead the (after adjustments,
642642
// equivalent) version

compiler/rustc_hir_typeck/src/upvar.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2223,7 +2223,7 @@ fn determine_place_ancestry_relation<'tcx>(
22232223
/// || drop(&*m.a.field_of_a)
22242224
/// // Here we really do want to capture `*m.a` because that outlives `'static`
22252225
///
2226-
/// // If we capture `m`, then the closure no longer outlives `'static'
2226+
/// // If we capture `m`, then the closure no longer outlives `'static`
22272227
/// // it is constrained to `'a`
22282228
/// }
22292229
/// ```

0 commit comments

Comments
 (0)