diff --git a/test_suite/tests/expand/de_enum.expanded.rs b/test_suite/tests/expand/de_enum.expanded.rs index a4ba2491..c5d44f8a 100644 --- a/test_suite/tests/expand/de_enum.expanded.rs +++ b/test_suite/tests/expand/de_enum.expanded.rs @@ -762,7 +762,7 @@ const _: () = { match __key { __Field::__field0 => { if _serde::export::Option::is_some(&__field0) { - return _serde :: export :: Err ( < __A :: Error as _serde :: de :: Error > :: duplicate_field ( "a" ) ) ; + return _serde :: export :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("a")) ; } __field0 = _serde::export::Some( match _serde::de::MapAccess::next_value::<i8>( @@ -777,7 +777,7 @@ const _: () = { } __Field::__field1 => { if _serde::export::Option::is_some(&__field1) { - return _serde :: export :: Err ( < __A :: Error as _serde :: de :: Error > :: duplicate_field ( "b" ) ) ; + return _serde :: export :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("b")) ; } __field1 = _serde::export::Some( match _serde::de::MapAccess::next_value::<B>( @@ -792,7 +792,7 @@ const _: () = { } __Field::__field2 => { if _serde::export::Option::is_some(&__field2) { - return _serde :: export :: Err ( < __A :: Error as _serde :: de :: Error > :: duplicate_field ( "c" ) ) ; + return _serde :: export :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("c")) ; } __field2 = _serde::export::Some( match _serde::de::MapAccess::next_value::<C>( @@ -807,7 +807,7 @@ const _: () = { } __Field::__field3 => { if _serde::export::Option::is_some(&__field3) { - return _serde :: export :: Err ( < __A :: Error as _serde :: de :: Error > :: duplicate_field ( "d" ) ) ; + return _serde :: export :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("d")) ; } __field3 = _serde::export::Some( match _serde::de::MapAccess::next_value::<D>( @@ -1265,7 +1265,7 @@ const _: () = { match __key { __Field::__field0 => { if _serde::export::Option::is_some(&__field0) { - return _serde :: export :: Err ( < __A :: Error as _serde :: de :: Error > :: duplicate_field ( "a" ) ) ; + return _serde :: export :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("a")) ; } __field0 = _serde::export::Some( match _serde::de::MapAccess::next_value::<i8>( @@ -1280,7 +1280,7 @@ const _: () = { } __Field::__field1 => { if _serde::export::Option::is_some(&__field1) { - return _serde :: export :: Err ( < __A :: Error as _serde :: de :: Error > :: duplicate_field ( "b" ) ) ; + return _serde :: export :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("b")) ; } __field1 = _serde::export::Some( match _serde::de::MapAccess::next_value::<B>( @@ -1295,7 +1295,7 @@ const _: () = { } __Field::__field2 => { if _serde::export::Option::is_some(&__field2) { - return _serde :: export :: Err ( < __A :: Error as _serde :: de :: Error > :: duplicate_field ( "c" ) ) ; + return _serde :: export :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("c")) ; } __field2 = _serde::export::Some( match _serde::de::MapAccess::next_value::<C>( @@ -1310,7 +1310,7 @@ const _: () = { } __Field::__field3 => { if _serde::export::Option::is_some(&__field3) { - return _serde :: export :: Err ( < __A :: Error as _serde :: de :: Error > :: duplicate_field ( "d" ) ) ; + return _serde :: export :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("d")) ; } __field3 = _serde::export::Some( match _serde::de::MapAccess::next_value::<D>( diff --git a/test_suite/tests/expand/generic_enum.expanded.rs b/test_suite/tests/expand/generic_enum.expanded.rs index add7c510..6f4cf28f 100644 --- a/test_suite/tests/expand/generic_enum.expanded.rs +++ b/test_suite/tests/expand/generic_enum.expanded.rs @@ -288,7 +288,7 @@ const _: () = { } { _serde::export::Some(__value) => __value, _serde::export::None => { - return _serde :: export :: Err ( _serde :: de :: Error :: invalid_length ( 0usize , & "tuple variant GenericEnum::Seq with 2 elements" ) ) ; + return _serde :: export :: Err (_serde :: de :: Error :: invalid_length (0usize , & "tuple variant GenericEnum::Seq with 2 elements")) ; } }; let __field1 = match match _serde::de::SeqAccess::next_element::< @@ -303,7 +303,7 @@ const _: () = { } { _serde::export::Some(__value) => __value, _serde::export::None => { - return _serde :: export :: Err ( _serde :: de :: Error :: invalid_length ( 1usize , & "tuple variant GenericEnum::Seq with 2 elements" ) ) ; + return _serde :: export :: Err (_serde :: de :: Error :: invalid_length (1usize , & "tuple variant GenericEnum::Seq with 2 elements")) ; } }; _serde::export::Ok(GenericEnum::Seq(__field0, __field1)) @@ -437,7 +437,7 @@ const _: () = { } { _serde::export::Some(__value) => __value, _serde::export::None => { - return _serde :: export :: Err ( _serde :: de :: Error :: invalid_length ( 0usize , & "struct variant GenericEnum::Map with 2 elements" ) ) ; + return _serde :: export :: Err (_serde :: de :: Error :: invalid_length (0usize , & "struct variant GenericEnum::Map with 2 elements")) ; } }; let __field1 = match match _serde::de::SeqAccess::next_element::< @@ -452,7 +452,7 @@ const _: () = { } { _serde::export::Some(__value) => __value, _serde::export::None => { - return _serde :: export :: Err ( _serde :: de :: Error :: invalid_length ( 1usize , & "struct variant GenericEnum::Map with 2 elements" ) ) ; + return _serde :: export :: Err (_serde :: de :: Error :: invalid_length (1usize , & "struct variant GenericEnum::Map with 2 elements")) ; } }; _serde::export::Ok(GenericEnum::Map { @@ -484,7 +484,7 @@ const _: () = { match __key { __Field::__field0 => { if _serde::export::Option::is_some(&__field0) { - return _serde :: export :: Err ( < __A :: Error as _serde :: de :: Error > :: duplicate_field ( "x" ) ) ; + return _serde :: export :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("x")) ; } __field0 = _serde::export::Some( match _serde::de::MapAccess::next_value::<T>( @@ -499,7 +499,7 @@ const _: () = { } __Field::__field1 => { if _serde::export::Option::is_some(&__field1) { - return _serde :: export :: Err ( < __A :: Error as _serde :: de :: Error > :: duplicate_field ( "y" ) ) ; + return _serde :: export :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("y")) ; } __field1 = _serde::export::Some( match _serde::de::MapAccess::next_value::<U>( diff --git a/test_suite/tests/expand/lifetimes.expanded.rs b/test_suite/tests/expand/lifetimes.expanded.rs index 9840d440..df498ca6 100644 --- a/test_suite/tests/expand/lifetimes.expanded.rs +++ b/test_suite/tests/expand/lifetimes.expanded.rs @@ -315,7 +315,7 @@ const _: () = { } { _serde::export::Some(__value) => __value, _serde::export::None => { - return _serde :: export :: Err ( _serde :: de :: Error :: invalid_length ( 0usize , & "struct variant Lifetimes::LifetimeMap with 1 element" ) ) ; + return _serde :: export :: Err (_serde :: de :: Error :: invalid_length (0usize , & "struct variant Lifetimes::LifetimeMap with 1 element")) ; } }; _serde::export::Ok(Lifetimes::LifetimeMap { a: __field0 }) @@ -342,7 +342,7 @@ const _: () = { match __key { __Field::__field0 => { if _serde::export::Option::is_some(&__field0) { - return _serde :: export :: Err ( < __A :: Error as _serde :: de :: Error > :: duplicate_field ( "a" ) ) ; + return _serde :: export :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("a")) ; } __field0 = _serde::export::Some( match _serde::de::MapAccess::next_value::<&'a i32>( @@ -500,7 +500,7 @@ const _: () = { } { _serde::export::Some(__value) => __value, _serde::export::None => { - return _serde :: export :: Err ( _serde :: de :: Error :: invalid_length ( 0usize , & "struct variant Lifetimes::NoLifetimeMap with 1 element" ) ) ; + return _serde :: export :: Err (_serde :: de :: Error :: invalid_length (0usize , & "struct variant Lifetimes::NoLifetimeMap with 1 element")) ; } }; _serde::export::Ok(Lifetimes::NoLifetimeMap { a: __field0 }) @@ -527,7 +527,7 @@ const _: () = { match __key { __Field::__field0 => { if _serde::export::Option::is_some(&__field0) { - return _serde :: export :: Err ( < __A :: Error as _serde :: de :: Error > :: duplicate_field ( "a" ) ) ; + return _serde :: export :: Err (< __A :: Error as _serde :: de :: Error > :: duplicate_field ("a")) ; } __field0 = _serde::export::Some( match _serde::de::MapAccess::next_value::<i32>(