Bug 1613517 - Make rust generate better code for derive(Animate) and …

…derive(ComputeSquaredDistance). r=heycam

See rust-lang/rust#68867.

This technically changes the semantics of #[animate(fallback)] and such when
combined with #[animate(error)]. But no such combination exists and the new
semantics are perfectly reasonable as well, IMHO.

Differential Revision: https://phabricator.services.mozilla.com/D61761

UltraBlame original commit: bd4711d31ec6ab173b77406cb4ede0fa7a484af3

servo/components/style_derive/animate.rs

@@ -75,6 +75,23 @@ input
 )
 ;
 let
+input_attrs
+=
+cg
+:
+:
+parse_input_attrs
+:
+:
+<
+AnimateInputAttrs
+>
+(
+&
+input
+)
+;
+let
 no_bound
 =
 animation_input_attrs
@@ -167,7 +184,7 @@ let
 (
 mut
 match_body
-append_error_clause
+needs_catchall_branch
 )
 =
 {
@@ -184,8 +201,7 @@ input
 )
 ;
 let
-mut
-append_error_clause
+needs_catchall_branch
 =
 s
 .
@@ -226,39 +242,13 @@ variant
 let
 arm
 =
-match
 derive_variant_arm
 (
 variant
 &
 mut
 where_clause
 )
-{
-Ok
-(
-arm
-)
-=
->
-arm
-Err
-(
-(
-)
-)
-=
->
-{
-append_error_clause
-=
-true
-;
-return
-body
-;
-}
-}
 ;
 quote
 !
@@ -273,7 +263,7 @@ arm
 ;
 (
 match_body
-append_error_clause
+needs_catchall_branch
 )
 }
 ;
@@ -286,35 +276,7 @@ where_clause
 where_clause
 ;
 if
-append_error_clause
-{
-let
-input_attrs
-=
-cg
-:
-:
-parse_input_attrs
-:
-:
-<
-AnimateInputAttrs
->
-(
-&
-input
-)
-;
-if
-let
-Some
-(
-fallback
-)
-=
-input_attrs
-.
-fallback
+needs_catchall_branch
 {
 match_body
 .
@@ -323,45 +285,20 @@ append_all
 quote
 !
 {
-(
-this
-other
-)
+_
 =
 >
-#
-fallback
-(
-this
-other
-procedure
-)
-}
-)
-;
-}
-else
+unsafe
 {
-match_body
-.
-append_all
-(
-quote
+debug_unreachable
 !
-{
-_
-=
->
-Err
 (
-(
-)
 )
 }
+}
 )
 ;
 }
-}
 let
 name
 =
@@ -385,6 +322,45 @@ split_for_impl
 (
 )
 ;
+let
+fallback
+=
+match
+input_attrs
+.
+fallback
+{
+Some
+(
+fallback
+)
+=
+>
+quote
+!
+{
+#
+fallback
+(
+self
+other
+procedure
+)
+}
+None
+=
+>
+quote
+!
+{
+Err
+(
+(
+)
+)
+}
+}
+;
 quote
 !
 {
@@ -452,6 +428,35 @@ Self
 )
 >
 {
+if
+std
+:
+:
+mem
+:
+:
+discriminant
+(
+self
+)
+!
+=
+std
+:
+:
+mem
+:
+:
+discriminant
+(
+other
+)
+{
+return
+#
+fallback
+;
+}
 match
 (
 self
@@ -483,12 +488,7 @@ WhereClause
 )
 -
 >
-Result
-<
 TokenStream
-(
-)
->
 {
 let
 variant_attrs
@@ -511,19 +511,6 @@ ast
 )
 )
 ;
-if
-variant_attrs
-.
-error
-{
-return
-Err
-(
-(
-)
-)
-;
-}
 let
 (
 this_pattern
@@ -560,6 +547,33 @@ other
 "
 )
 ;
+if
+variant_attrs
+.
+error
+{
+return
+quote
+!
+{
+(
+&
+#
+this_pattern
+&
+#
+other_pattern
+)
+=
+>
+Err
+(
+(
+)
+)
+}
+;
+}
 let
 (
 result_value
@@ -775,8 +789,6 @@ procedure
 )
 )
 ;
-Ok
-(
 quote
 !
 {
@@ -800,7 +812,6 @@ result_value
 )
 }
 }
-)
 }
 #
 [