Skip to content

Commit 74ef0c3

Browse files
committedJul 16, 2021
Auto merge of #87201 - GuillaumeGomez:rollup-4loi2q9, r=GuillaumeGomez
Rollup of 7 pull requests Successful merges: - #87107 (Loop over all opaque types instead of looking at just the first one with the same DefId) - #87158 (Suggest full enum variant for local modules) - #87174 (Stabilize `[T; N]::map()`) - #87179 (Mark `const_trait_impl` as active) - #87180 (feat(rustdoc): open sidebar menu when links inside it are focused) - #87188 (Add GUI test for auto-hide-trait-implementations setting) - #87200 (TAIT: Infer all inference variables in opaque type substitutions via InferCx) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents c49895d + 7d36d69 commit 74ef0c3

File tree

57 files changed

+162
-233
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+162
-233
lines changed
 

‎compiler/rustc_data_structures/src/vec_map.rs

+6-4
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,15 @@ impl<K, V> IntoIterator for VecMap<K, V> {
127127
}
128128
}
129129

130-
impl<K, V> Extend<(K, V)> for VecMap<K, V> {
130+
impl<K: PartialEq, V> Extend<(K, V)> for VecMap<K, V> {
131131
fn extend<I: IntoIterator<Item = (K, V)>>(&mut self, iter: I) {
132-
self.0.extend(iter);
132+
for (k, v) in iter {
133+
self.insert(k, v);
134+
}
133135
}
134136

135-
fn extend_one(&mut self, item: (K, V)) {
136-
self.0.extend_one(item);
137+
fn extend_one(&mut self, (k, v): (K, V)) {
138+
self.insert(k, v);
137139
}
138140

139141
fn extend_reserve(&mut self, additional: usize) {

‎compiler/rustc_feature/src/active.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ declare_features! (
534534
(active, bindings_after_at, "1.41.0", Some(65490), None),
535535

536536
/// Allows `impl const Trait for T` syntax.
537-
(incomplete, const_trait_impl, "1.42.0", Some(67792), None),
537+
(active, const_trait_impl, "1.42.0", Some(67792), None),
538538

539539
/// Allows `T: ?const Trait` syntax in bounds.
540540
(incomplete, const_trait_bound_opt_out, "1.42.0", Some(67794), None),

0 commit comments

Comments
 (0)