Switch to Vec of MatchPairs

Because I'm about to make MatchPair recursive, which I can't do with
SmallVec, and I need to share code between the two.

Author: Nadrieril

compiler/rustc_mir_build/src/build/matches/mod.rs

@@ -22,8 +22,6 @@ use rustc_middle::ty::{self, CanonicalUserTypeAnnotation, Ty};
 use rustc_span::symbol::Symbol;
 use rustc_span::{BytePos, Pos, Span};
 use rustc_target::abi::VariantIdx;
-use smallvec::{smallvec, SmallVec};
-
 // helper functions, broken out by category:
 mod simplify;
 mod test;
@@ -951,7 +949,7 @@ struct Candidate<'pat, 'tcx> {
     has_guard: bool,
 
     /// All of these must be satisfied...
-    match_pairs: SmallVec<[MatchPair<'pat, 'tcx>; 1]>,
+    match_pairs: Vec<MatchPair<'pat, 'tcx>>,
 
     /// ...these bindings established...
     bindings: Vec<Binding<'tcx>>,
@@ -981,7 +979,7 @@ impl<'tcx, 'pat> Candidate<'pat, 'tcx> {
         Candidate {
             span: pattern.span,
             has_guard,
-            match_pairs: smallvec![MatchPair::new(place, pattern, cx)],
+            match_pairs: vec![MatchPair::new(place, pattern, cx)],
             bindings: Vec::new(),
             ascriptions: Vec::new(),
             subcandidates: Vec::new(),

compiler/rustc_mir_build/src/build/matches/simplify.rs

@@ -16,8 +16,6 @@ use crate::build::expr::as_place::PlaceBuilder;
 use crate::build::matches::{Ascription, Binding, Candidate, MatchPair};
 use crate::build::Builder;
 use rustc_middle::thir::{self, *};
-use smallvec::SmallVec;
-
 use std::mem;
 
 impl<'a, 'tcx> Builder<'a, 'tcx> {
@@ -39,7 +37,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         &mut self,
         bindings: &mut Vec<Binding<'tcx>>,
         ascriptions: &mut Vec<Ascription<'tcx>>,
-        match_pairs: &mut SmallVec<[MatchPair<'pat, 'tcx>; 1]>,
+        match_pairs: &mut Vec<MatchPair<'pat, 'tcx>>,
         subcandidates: &mut Vec<Candidate<'pat, 'tcx>>,
         has_guard: bool,
     ) -> bool {
@@ -61,7 +59,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         &mut self,
         candidate_bindings: &mut Vec<Binding<'tcx>>,
         candidate_ascriptions: &mut Vec<Ascription<'tcx>>,
-        candidate_match_pairs: &mut SmallVec<[MatchPair<'pat, 'tcx>; 1]>,
+        candidate_match_pairs: &mut Vec<MatchPair<'pat, 'tcx>>,
     ) {
         // repeatedly simplify match pairs until fixed point is reached
 
@@ -177,7 +175,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         match_pair: MatchPair<'pat, 'tcx>,
         bindings: &mut Vec<Binding<'tcx>>,
         ascriptions: &mut Vec<Ascription<'tcx>>,
-        match_pairs: &mut SmallVec<[MatchPair<'pat, 'tcx>; 1]>,
+        match_pairs: &mut Vec<MatchPair<'pat, 'tcx>>,
     ) -> Result<(), MatchPair<'pat, 'tcx>> {
         match match_pair.pattern.kind {
             PatKind::AscribeUserType {

compiler/rustc_mir_build/src/build/matches/util.rs

@@ -6,7 +6,6 @@ use rustc_middle::mir::*;
 use rustc_middle::thir::*;
 use rustc_middle::ty;
 use rustc_middle::ty::TypeVisitableExt;
-use smallvec::SmallVec;
 
 impl<'a, 'tcx> Builder<'a, 'tcx> {
     pub(crate) fn field_match_pairs<'pat>(
@@ -26,7 +25,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
 
     pub(crate) fn prefix_slice_suffix<'pat>(
         &mut self,
-        match_pairs: &mut SmallVec<[MatchPair<'pat, 'tcx>; 1]>,
+        match_pairs: &mut Vec<MatchPair<'pat, 'tcx>>,
         place: &PlaceBuilder<'tcx>,
         prefix: &'pat [Box<Pat<'tcx>>],
         opt_slice: &'pat Option<Box<Pat<'tcx>>>,