diff --git a/servo/components/plugins/lints/unrooted_must_root.rs b/servo/components/plugins/lints/unrooted_must_root.rs index 06a227f278592..8fb6178d554bc 100644 --- a/servo/components/plugins/lints/unrooted_must_root.rs +++ b/servo/components/plugins/lints/unrooted_must_root.rs @@ -1215,7 +1215,7 @@ tcx hir : : -Expr +Body span : codemap @@ -1389,8 +1389,6 @@ span_lint UNROOTED_MUST_ROOT arg . -ty -. span " Type @@ -1463,7 +1461,10 @@ walk_expr & mut visitor +& body +. +value ) ; } @@ -2002,7 +2003,7 @@ body hir : : -ExprId +BodyId span : codemap diff --git a/servo/components/plugins/utils.rs b/servo/components/plugins/utils.rs index c53bf285a5bf8..13ccbcc3003cf 100644 --- a/servo/components/plugins/utils.rs +++ b/servo/components/plugins/utils.rs @@ -376,6 +376,23 @@ PathSegment { parameters : +Some +( +ref +params +) +. +. +} +) += +> +{ +match +* +* +params +{ ast : : @@ -387,13 +404,8 @@ AngleBracketed ref a ) -. -. -} -) = > -{ Some ( & @@ -401,8 +413,55 @@ a . types ) -} +/ +/ +Foo +( +A +B +) +- +> +C +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