simplify merging of two vecs

matthiaskrgr · matthiaskrgr · commit 6892fcd690fe · 2023-12-12T18:42:37.000+01:00
diff --git a/compiler/rustc_pattern_analysis/src/constructor.rs b/compiler/rustc_pattern_analysis/src/constructor.rs
@@ -979,7 +979,7 @@ impl ConstructorSet {
             && !(pcx.is_top_level && matches!(self, Self::NoConstructors))
         {
             // Treat all missing constructors as nonempty.
-            missing.extend(missing_empty.drain(..));
+            missing.append(&mut missing_empty);
         }
 
         SplitConstructorSet { present, missing, missing_empty }
diff --git a/compiler/rustc_resolve/src/late/diagnostics.rs b/compiler/rustc_resolve/src/late/diagnostics.rs
@@ -2178,7 +2178,7 @@ impl<'a: 'ast, 'ast, 'tcx> LateResolutionVisitor<'a, '_, 'ast, 'tcx> {
                 let (span, text) = match path.segments.first() {
                     Some(seg) if let Some(name) = seg.ident.as_str().strip_prefix("let") => {
                         // a special case for #117894
-                        let name = name.strip_prefix("_").unwrap_or(name);
+                        let name = name.strip_prefix('_').unwrap_or(name);
                         (ident_span, format!("let {name}"))
                     }
                     _ => (ident_span.shrink_to_lo(), "let ".to_string()),

Original file line number	Diff line number	Diff line change
`@@ -979,7 +979,7 @@ impl ConstructorSet {`
`979`	`979`	`&& !(pcx.is_top_level && matches!(self, Self::NoConstructors))`
`980`	`980`	`{`
`981`	`981`	`// Treat all missing constructors as nonempty.`
`982`		`- missing.extend(missing_empty.drain(..));`
	`982`	`+ missing.append(&mut missing_empty);`
`983`	`983`	`}`
`984`	`984`
`985`	`985`	`SplitConstructorSet { present, missing, missing_empty }`
Original file line number	Diff line number	Diff line change
`@@ -2178,7 +2178,7 @@ impl<'a: 'ast, 'ast, 'tcx> LateResolutionVisitor<'a, '_, 'ast, 'tcx> {`
`2178`	`2178`	`let (span, text) = match path.segments.first() {`
`2179`	`2179`	`Some(seg) if let Some(name) = seg.ident.as_str().strip_prefix("let") => {`
`2180`	`2180`	`// a special case for #117894`
`2181`		`- let name = name.strip_prefix("_").unwrap_or(name);`
	`2181`	`+ let name = name.strip_prefix('_').unwrap_or(name);`
`2182`	`2182`	`(ident_span, format!("let {name}"))`
`2183`	`2183`	`}`
`2184`	`2184`	`_ => (ident_span.shrink_to_lo(), "let ".to_string()),`