about summary refs log tree commit diff
path: root/compiler/rustc_hir_analysis/src/constrained_generic_params.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-02-13 00:31:53 +0000
committerbors <bors@rust-lang.org>2024-02-13 00:31:53 +0000
commit0a5b998c57a8681acc13206b5917340b053b3a30 (patch)
treed673efacffd4baf86b67a6d9e2e511a1d2db8888 /compiler/rustc_hir_analysis/src/constrained_generic_params.rs
parent74c3f5a146860c94ff4d179fc3bfa34f879adf41 (diff)
parent8a87cdacb15d4856e60388d456449158e3f542b6 (diff)
downloadrust-0a5b998c57a8681acc13206b5917340b053b3a30.tar.gz
rust-0a5b998c57a8681acc13206b5917340b053b3a30.zip
Auto merge of #120991 - matthiaskrgr:rollup-f8kw2st, r=matthiaskrgr
Rollup of 8 pull requests

Successful merges:

 - #118983 (Warn on references casting to bigger memory layout)
 - #119451 (Gate PR CI on clippy correctness lints)
 - #120273 (compiletest: few naive improvements)
 - #120950 (Fix async closures in CTFE)
 - #120958 (Dejargonize `subst`)
 - #120965 (Add lahfsahf and prfchw target feature)
 - #120970 (add another test for promoteds-in-static)
 - #120979 (Update books)

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_hir_analysis/src/constrained_generic_params.rs')
-rw-r--r--compiler/rustc_hir_analysis/src/constrained_generic_params.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_hir_analysis/src/constrained_generic_params.rs b/compiler/rustc_hir_analysis/src/constrained_generic_params.rs
index 65d1ffa40e2..05efad3ccb3 100644
--- a/compiler/rustc_hir_analysis/src/constrained_generic_params.rs
+++ b/compiler/rustc_hir_analysis/src/constrained_generic_params.rs
@@ -119,7 +119,7 @@ pub fn identify_constrained_generic_params<'tcx>(
 ///   * `<U as Iterator>::Item = T` -- a desugared ProjectionPredicate
 ///
 /// When we, for example, try to go over the trait-reference
-/// `IntoIter<u32> as Trait`, we substitute the impl parameters with fresh
+/// `IntoIter<u32> as Trait`, we instantiate the impl parameters with fresh
 /// variables and match them with the impl trait-ref, so we know that
 /// `$U = IntoIter<u32>`.
 ///