@@ -1750,7 +1750,7 @@ pub(crate) enum PrimitiveType {
17501750 Never ,
17511751}
17521752
1753- type SimplifiedTypes = FxHashMap < PrimitiveType , ArrayVec < SimplifiedType , 2 > > ;
1753+ type SimplifiedTypes = FxHashMap < PrimitiveType , ArrayVec < SimplifiedType , 3 > > ;
17541754impl PrimitiveType {
17551755 pub ( crate ) fn from_hir ( prim : hir:: PrimTy ) -> PrimitiveType {
17561756 use ast:: { FloatTy , IntTy , UintTy } ;
@@ -1839,10 +1839,10 @@ impl PrimitiveType {
18391839 //
18401840 // Either manually update this arrayvec at this point
18411841 // or start with a more complex refactoring.
1842- Tuple => [ TupleSimplifiedType ( 2 ) , TupleSimplifiedType ( 3 ) ] . into( ) ,
1842+ Tuple => [ TupleSimplifiedType ( 1 ) , TupleSimplifiedType ( 2 ) , TupleSimplifiedType ( 3 ) ] . into( ) ,
18431843 Unit => single( TupleSimplifiedType ( 0 ) ) ,
1844- RawPointer => [ PtrSimplifiedType ( Mutability :: Not ) , PtrSimplifiedType ( Mutability :: Mut ) ] . into ( ) ,
1845- Reference => [ RefSimplifiedType ( Mutability :: Not ) , RefSimplifiedType ( Mutability :: Mut ) ] . into ( ) ,
1844+ RawPointer => [ PtrSimplifiedType ( Mutability :: Not ) , PtrSimplifiedType ( Mutability :: Mut ) ] . into_iter ( ) . collect ( ) ,
1845+ Reference => [ RefSimplifiedType ( Mutability :: Not ) , RefSimplifiedType ( Mutability :: Mut ) ] . into_iter ( ) . collect ( ) ,
18461846 // FIXME: This will be wrong if we ever add inherent impls
18471847 // for function pointers.
18481848 Fn => ArrayVec :: new( ) ,
0 commit comments