diff options
| author | Deadbeef <ent3rm4n@gmail.com> | 2023-12-10 10:17:28 +0000 |
|---|---|---|
| committer | Deadbeef <ent3rm4n@gmail.com> | 2023-12-10 10:17:28 +0000 |
| commit | d1f4bc5a19d2cddced73bb026c386081c7357819 (patch) | |
| tree | 18c929605c9165df57b50bb0fc8a38973c137a67 /compiler/rustc_middle/src/ty/generics.rs | |
| parent | 2f457d9d6085de41d112aeb1116761ce480427b6 (diff) | |
| download | rust-d1f4bc5a19d2cddced73bb026c386081c7357819.tar.gz rust-d1f4bc5a19d2cddced73bb026c386081c7357819.zip | |
Revert "Don't print host effect param in pretty path_generic_args"
This reverts commit f1bf874fb13703d706fc8184407c6df12555d8e9.
Diffstat (limited to 'compiler/rustc_middle/src/ty/generics.rs')
| -rw-r--r-- | compiler/rustc_middle/src/ty/generics.rs | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/compiler/rustc_middle/src/ty/generics.rs b/compiler/rustc_middle/src/ty/generics.rs index f0e63dfddda..4a4a9db1bb3 100644 --- a/compiler/rustc_middle/src/ty/generics.rs +++ b/compiler/rustc_middle/src/ty/generics.rs @@ -320,11 +320,9 @@ impl<'tcx> Generics { &'tcx self, tcx: TyCtxt<'tcx>, args: &'tcx [ty::GenericArg<'tcx>], - ) -> (&'tcx [ty::GenericArg<'tcx>], &'tcx [ty::GenericParamDef]) { - let mut own_args = self.parent_count..self.count(); - let mut own_params = 0..self.params.len(); + ) -> &'tcx [ty::GenericArg<'tcx>] { + let mut own_params = self.parent_count..self.count(); if self.has_self && self.parent.is_none() { - own_args.start = 1; own_params.start = 1; } @@ -334,7 +332,7 @@ impl<'tcx> Generics { // of semantic equivalence. While not ideal, that's // good enough for now as this should only be used // for diagnostics anyways. - let num_default_params = self + own_params.end -= self .params .iter() .rev() @@ -346,10 +344,8 @@ impl<'tcx> Generics { || matches!(param.kind, GenericParamDefKind::Const { is_host_effect: true, .. }) }) .count(); - own_params.end -= num_default_params; - own_args.end -= num_default_params; - (&args[own_args], &self.params[own_params]) + &args[own_params] } /// Returns the args corresponding to the generic parameters of this item, excluding `Self`. |
