diff --git a/servo/components/plugins/lints/unrooted_must_root.rs b/servo/components/plugins/lints/unrooted_must_root.rs index eca9e98c28c29..0a0ec1f842388 100644 --- a/servo/components/plugins/lints/unrooted_must_root.rs +++ b/servo/components/plugins/lints/unrooted_must_root.rs @@ -823,7 +823,7 @@ tcx hir : : -Expr +Body span : codemap @@ -997,8 +997,6 @@ span_lint UNROOTED_MUST_ROOT arg . -ty -. span " Type @@ -1071,7 +1069,10 @@ walk_expr & mut visitor +& body +. +value ) ; } @@ -1427,7 +1428,7 @@ body hir : : -ExprId +BodyId span : codemap diff --git a/servo/components/plugins/utils.rs b/servo/components/plugins/utils.rs index ff471fc04d910..3d8778d916b56 100644 --- a/servo/components/plugins/utils.rs +++ b/servo/components/plugins/utils.rs @@ -209,6 +209,23 @@ PathSegment { parameters : +Some +( +ref +params +) +. +. +} +) += +> +{ +match +* +* +params +{ ast : : @@ -220,13 +237,8 @@ AngleBracketed ref a ) -. -. -} -) = > -{ Some ( & @@ -234,8 +246,45 @@ a . types ) -} +ast +: +: +PathParameters +: +: +Parenthesized +( _ +) += +> +None +} +} +Some +( +& +ast +: +: +PathSegment +{ +parameters +: +None +. +. +} +) += +> +Some +( +& +[ +] +) +None = > None diff --git a/servo/rust-nightly-date b/servo/rust-nightly-date index e378458574889..9e1d7c8f6db4c 100644 --- a/servo/rust-nightly-date +++ b/servo/rust-nightly-date @@ -2,4 +2,4 @@ - 12 - -19 +29