Skip to content

Commit

Permalink
servo: Merge #14689 - Update to rustc 1.16.0-nightly (4ecc85beb 2016-…
Browse files Browse the repository at this point in the history
…12-28) (from servo:rustup); r=Manishearth

<s>**This is not ready to land** since there is no corresponding Nightly build of Rust yet.</s> Update: we got a Nightly build on 2016-12-29: http://rusty-dash.com/nightlies

I made these changes to check that rust-lang/rust#38566 fixes rust-lang/rust#38535 (which it does, yay!) so I might as well publish them, we’ll need them soon enough.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 9bdd0f401a89398fb2ecd4f6b54691a7c93b2e53

UltraBlame original commit: 17e25ccaa7dfe2f7c7d88878a1fb5ce5f1888914
  • Loading branch information
marco-c committed Oct 1, 2019
1 parent d544ef3 commit 831550d
Show file tree
Hide file tree
Showing 3 changed files with 71 additions and 11 deletions.
9 changes: 5 additions & 4 deletions servo/components/plugins/lints/unrooted_must_root.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1215,7 +1215,7 @@ tcx
hir
:
:
Expr
Body
span
:
codemap
Expand Down Expand Up @@ -1389,8 +1389,6 @@ span_lint
UNROOTED_MUST_ROOT
arg
.
ty
.
span
"
Type
Expand Down Expand Up @@ -1463,7 +1461,10 @@ walk_expr
&
mut
visitor
&
body
.
value
)
;
}
Expand Down Expand Up @@ -2002,7 +2003,7 @@ body
hir
:
:
ExprId
BodyId
span
:
codemap
Expand Down
71 changes: 65 additions & 6 deletions servo/components/plugins/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,23 @@ PathSegment
{
parameters
:
Some
(
ref
params
)
.
.
}
)
=
>
{
match
*
*
params
{
ast
:
:
Expand All @@ -387,22 +404,64 @@ AngleBracketed
ref
a
)
.
.
}
)
=
>
{
Some
(
&
a
.
types
)
}
/
/
Foo
(
A
B
)
-
>
C
ast
:
:
PathParameters
:
:
Parenthesized
(
_
)
=
>
None
}
}
Some
(
&
ast
:
:
PathSegment
{
parameters
:
None
.
.
}
)
=
>
Some
(
&
[
]
)
None
=
>
None
Expand Down
2 changes: 1 addition & 1 deletion servo/rust-nightly-date
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
-
12
-
19
29

0 comments on commit 831550d

Please sign in to comment.