diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2025-02-06 21:56:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-06 21:56:25 +0100 |
| commit | ae1410e2d8c6c06fabdb1b6f2a0420e461e5b74e (patch) | |
| tree | 8d5b84bd85c624ae8363e26f5b8f10dbf9332307 | |
| parent | 4b7e55ada3c7d6c678c6f54f91b701f50fa62181 (diff) | |
| parent | e485cc5e0217fbb3f495ee0db56d6dcb5f36de22 (diff) | |
| download | rust-ae1410e2d8c6c06fabdb1b6f2a0420e461e5b74e.tar.gz rust-ae1410e2d8c6c06fabdb1b6f2a0420e461e5b74e.zip | |
Rollup merge of #136069 - yotamofek:next-solver-slice, r=compiler-errors
Simplify slice indexing in next trait solver Unless I'm missing something: - no need to explicitly specify the end of the slice as the end of the index range - the `assert` is redundant since the indexing will panic for the same condition I think this change simplifies it a bit. Also replaced the `for` loop of `push`es with a call to `extend` with an iterator. Might improve performance since it knows how many elements will be added beforehand and can pre-reserve room? r? `@compiler-errors` , I think
| -rw-r--r-- | compiler/rustc_next_trait_solver/src/solve/eval_ctxt/canonical.rs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/compiler/rustc_next_trait_solver/src/solve/eval_ctxt/canonical.rs b/compiler/rustc_next_trait_solver/src/solve/eval_ctxt/canonical.rs index 39e365806cb..a0d41110d96 100644 --- a/compiler/rustc_next_trait_solver/src/solve/eval_ctxt/canonical.rs +++ b/compiler/rustc_next_trait_solver/src/solve/eval_ctxt/canonical.rs @@ -453,13 +453,11 @@ where { // In case any fresh inference variables have been created between `state` // and the previous instantiation, extend `orig_values` for it. - assert!(orig_values.len() <= state.value.var_values.len()); - for &arg in &state.value.var_values.var_values.as_slice() - [orig_values.len()..state.value.var_values.len()] - { - let unconstrained = delegate.fresh_var_for_kind_with_span(arg, span); - orig_values.push(unconstrained); - } + orig_values.extend( + state.value.var_values.var_values.as_slice()[orig_values.len()..] + .iter() + .map(|&arg| delegate.fresh_var_for_kind_with_span(arg, span)), + ); let instantiation = EvalCtxt::compute_query_response_instantiation_values(delegate, orig_values, &state, span); |
