@@ -297,18 +297,18 @@ impl<'db> FixedLengthTuple<Type<'db>> {
297
297
& self ,
298
298
db : & ' db dyn Db ,
299
299
new_length : TupleLength ,
300
- ) -> Result < Tuple < Type < ' db > > , TupleUnpackerError > {
300
+ ) -> Result < Tuple < Type < ' db > > , ResizeTupleError > {
301
301
match new_length {
302
302
TupleLength :: Fixed ( new_length) => match self . len ( ) . cmp ( & new_length) {
303
- Ordering :: Less => Err ( TupleUnpackerError :: TooFewValues ) ,
304
- Ordering :: Greater => Err ( TupleUnpackerError :: TooManyValues ) ,
303
+ Ordering :: Less => Err ( ResizeTupleError :: TooFewValues ) ,
304
+ Ordering :: Greater => Err ( ResizeTupleError :: TooManyValues ) ,
305
305
Ordering :: Equal => Ok ( Tuple :: Fixed ( self . clone ( ) ) ) ,
306
306
} ,
307
307
308
308
TupleLength :: Variable ( prefix, suffix) => {
309
309
// The number of rhs values that will be consumed by the starred target.
310
310
let Some ( variable) = self . len ( ) . checked_sub ( prefix + suffix) else {
311
- return Err ( TupleUnpackerError :: TooFewValues ) ;
311
+ return Err ( ResizeTupleError :: TooFewValues ) ;
312
312
} ;
313
313
314
314
// Extract rhs values into the prefix, then into the starred target, then into the
@@ -600,13 +600,13 @@ impl<'db> VariableLengthTuple<Type<'db>> {
600
600
& self ,
601
601
db : & ' db dyn Db ,
602
602
new_length : TupleLength ,
603
- ) -> Result < Tuple < Type < ' db > > , TupleUnpackerError > {
603
+ ) -> Result < Tuple < Type < ' db > > , ResizeTupleError > {
604
604
match new_length {
605
605
TupleLength :: Fixed ( new_length) => {
606
606
// The number of elements that will get their value from our variable-length
607
607
// portion.
608
608
let Some ( variable_count) = new_length. checked_sub ( self . len ( ) . minimum ( ) ) else {
609
- return Err ( TupleUnpackerError :: TooManyValues ) ;
609
+ return Err ( ResizeTupleError :: TooManyValues ) ;
610
610
} ;
611
611
Ok ( Tuple :: Fixed ( FixedLengthTuple :: from_elements (
612
612
( self . prefix_elements ( ) . copied ( ) )
@@ -970,7 +970,7 @@ impl<'db> Tuple<Type<'db>> {
970
970
& self ,
971
971
db : & ' db dyn Db ,
972
972
new_length : TupleLength ,
973
- ) -> Result < Self , TupleUnpackerError > {
973
+ ) -> Result < Self , ResizeTupleError > {
974
974
match self {
975
975
Tuple :: Fixed ( tuple) => tuple. resize ( db, new_length) ,
976
976
Tuple :: Variable ( tuple) => tuple. resize ( db, new_length) ,
@@ -1194,7 +1194,7 @@ impl<'db> TupleUnpacker<'db> {
1194
1194
pub ( crate ) fn unpack_tuple (
1195
1195
& mut self ,
1196
1196
values : & Tuple < Type < ' db > > ,
1197
- ) -> Result < ( ) , TupleUnpackerError > {
1197
+ ) -> Result < ( ) , ResizeTupleError > {
1198
1198
let values = values. resize ( self . db , self . targets . len ( ) ) ?;
1199
1199
match ( & mut self . targets , & values) {
1200
1200
( Tuple :: Fixed ( targets) , Tuple :: Fixed ( values) ) => {
@@ -1252,7 +1252,7 @@ impl<'db> VariableLengthTuple<UnionBuilder<'db>> {
1252
1252
}
1253
1253
1254
1254
#[ derive( Clone , Debug , Eq , PartialEq ) ]
1255
- pub ( crate ) enum TupleUnpackerError {
1255
+ pub ( crate ) enum ResizeTupleError {
1256
1256
TooFewValues ,
1257
1257
TooManyValues ,
1258
1258
}
0 commit comments