servo: Merge #6156 - Fix deprecated plugin APIs (from Manishearth:warn_fix); r=larsbergstrom

r? larsbergstrom


(The diff is borked here, but I only just added `if let`s and wrapped/unwrapped in `Annotatable`s)

Source-Repo: https://github.com/servo/servo
Source-Revision: ef7fa99bd2c4ff52be1c6361d9f1eca3775c88c5

UltraBlame original commit: 4a8fec2dd4440efa5dce413398d99e72ce839248

Author: marco-c

servo/components/plugins/jstraceable.rs

@@ -39,7 +39,6 @@ ast
 :
 :
 {
-Item
 MetaItem
 Expr
 }
@@ -95,26 +94,32 @@ cx
 &
 mut
 ExtCtxt
-_
+sp
 :
 Span
 _
 :
 &
 MetaItem
-item
+anno
 :
-P
-<
-Item
->
+Annotatable
 )
 -
 >
-P
-<
+Annotatable
+{
+if
+let
+Annotatable
+:
+:
 Item
->
+(
+item
+)
+=
+anno
 {
 let
 mut
@@ -214,10 +219,41 @@ _dom_struct_marker
 )
 )
 ;
+Annotatable
+:
+:
+Item
+(
 P
 (
 item2
 )
+)
+}
+else
+{
+cx
+.
+span_err
+(
+sp
+"
+#
+[
+dom_struct
+]
+applied
+to
+something
+other
+than
+a
+struct
+"
+)
+;
+anno
+}
 }
 pub
 fn

servo/components/plugins/lib.rs

@@ -118,7 +118,7 @@ intern
 dom_struct
 "
 )
-Modifier
+MultiModifier
 (
 box
 jstraceable
@@ -158,7 +158,7 @@ intern
 _generate_reflector
 "
 )
-Decorator
+MultiDecorator
 (
 box
 reflector

servo/components/plugins/reflector.rs

@@ -8,7 +8,10 @@ ext
 base
 :
 :
+{
+Annotatable
 ExtCtxt
+}
 ;
 use
 syntax
@@ -23,22 +26,10 @@ use
 syntax
 :
 :
-ptr
-:
-:
-P
-;
-use
-syntax
-:
-:
 ast
 :
 :
-{
-Item
 MetaItem
-}
 ;
 use
 syntax
@@ -68,26 +59,30 @@ _
 :
 &
 MetaItem
-item
+annotatable
 :
-&
-Item
+Annotatable
 push
 :
 &
 mut
 FnMut
 (
-P
-<
-Item
->
+Annotatable
 )
--
->
-(
 )
+{
+if
+let
+Annotatable
+:
+:
+Item
+(
+item
 )
+=
+annotatable
 {
 if
 let
@@ -245,9 +240,15 @@ it
 |
 push
 (
+Annotatable
+:
+:
+Item
+(
 it
 )
 )
+)
 }
 None
 =
@@ -342,9 +343,15 @@ it
 |
 push
 (
+Annotatable
+:
+:
+Item
+(
 it
 )
 )
+)
 }
 }
 ;
@@ -376,3 +383,4 @@ struct
 ;
 }
 }
+}