diff options
| author | bors <bors@rust-lang.org> | 2023-03-21 12:06:26 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-21 12:06:26 +0000 |
| commit | a01b4cc9f375f1b95fa8195daeea938d3d9c4c34 (patch) | |
| tree | 6253002cc0f9d198fe8747567aee1dd07636379b /compiler/rustc_hir_analysis/src | |
| parent | ef03fda339923e659d3d3ca3321de887316d2807 (diff) | |
| parent | 925fbcdf8a1646d5318e82c6d3ffeda41a10a110 (diff) | |
| download | rust-a01b4cc9f375f1b95fa8195daeea938d3d9c4c34.tar.gz rust-a01b4cc9f375f1b95fa8195daeea938d3d9c4c34.zip | |
Auto merge of #109442 - Nilstrieb:rollup-seb5xsa, r=Nilstrieb
Rollup of 10 pull requests Successful merges: - #106434 (Document `Iterator::sum/product` for Option/Result) - #108326 (Implement read_buf for a few more types) - #108842 (Enforce non-lifetime-binders in supertrait preds are not object safe) - #108896 (new solver: make all goal evaluation able to be automatically rerun ) - #109124 (Add `dist.compression-profile` option to control compression speed) - #109240 (Walk un-shifted nested `impl Trait` in trait when setting up default trait method assumptions) - #109385 (fix typo) - #109386 (add myself to mailmap) - #109390 (Custom MIR: Support aggregate expressions) - #109408 (not *all* retags might be explicit in Runtime MIR) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_hir_analysis/src')
| -rw-r--r-- | compiler/rustc_hir_analysis/src/collect/type_of.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_hir_analysis/src/collect/type_of.rs b/compiler/rustc_hir_analysis/src/collect/type_of.rs index 4bbea878904..7ab7a8c4c1b 100644 --- a/compiler/rustc_hir_analysis/src/collect/type_of.rs +++ b/compiler/rustc_hir_analysis/src/collect/type_of.rs @@ -605,7 +605,7 @@ fn find_opaque_ty_constraints_for_tait(tcx: TyCtxt<'_>, def_id: LocalDefId) -> T found: Option<ty::OpaqueHiddenType<'tcx>>, /// In the presence of dead code, typeck may figure out a hidden type - /// while borrowck will now. We collect these cases here and check at + /// while borrowck will not. We collect these cases here and check at /// the end that we actually found a type that matches (modulo regions). typeck_types: Vec<ty::OpaqueHiddenType<'tcx>>, } |
