diff options
| author | bors <bors@rust-lang.org> | 2023-01-23 07:32:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-01-23 07:32:07 +0000 |
| commit | 6b3cd03fdb285781c60f5962194719fdfd46d910 (patch) | |
| tree | 84eaf25c217169e58808d559f1c66f8c9abe6a1a /compiler/rustc_borrowck | |
| parent | ad48c109815a2e9441a7ad7796e55b8771fe01a5 (diff) | |
| parent | 66d6a0b5da24b41185d060e3e7f9155a22f78872 (diff) | |
| download | rust-6b3cd03fdb285781c60f5962194719fdfd46d910.tar.gz rust-6b3cd03fdb285781c60f5962194719fdfd46d910.zip | |
Auto merge of #107215 - Dylan-DPC:rollup-zqtiufk, r=Dylan-DPC
Rollup of 7 pull requests Successful merges: - #104926 (Move relationships from FulfillmentContext to Inherited) - #106854 (Add `Arc::into_inner` for safely discarding `Arc`s without calling the destructor on the inner type.) - #107108 (Consider doc(alias) when providing typo suggestions) - #107186 (rustdoc: Use correct pseudo-element selector) - #107192 (Add myself to the mailmap) - #107195 (Fix typo in universal_regions.rs comment) - #107203 (Suggest remove deref for type mismatch) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_borrowck')
| -rw-r--r-- | compiler/rustc_borrowck/src/universal_regions.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_borrowck/src/universal_regions.rs b/compiler/rustc_borrowck/src/universal_regions.rs index 5b4d99682d9..8bff66f8d5c 100644 --- a/compiler/rustc_borrowck/src/universal_regions.rs +++ b/compiler/rustc_borrowck/src/universal_regions.rs @@ -162,7 +162,7 @@ struct UniversalRegionIndices<'tcx> { /// `ty::Region` to the internal `RegionVid` we are using. This is /// used because trait matching and type-checking will feed us /// region constraints that reference those regions and we need to - /// be able to map them our internal `RegionVid`. This is + /// be able to map them to our internal `RegionVid`. This is /// basically equivalent to an `InternalSubsts`, except that it also /// contains an entry for `ReStatic` -- it might be nice to just /// use a substs, and then handle `ReStatic` another way. |