Skip to content

Commit 831550d

Browse files
committed
servo: Merge #14689 - Update to rustc 1.16.0-nightly (4ecc85beb 2016-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
1 parent d544ef3 commit 831550d

File tree

3 files changed

+71
-11
lines changed

3 files changed

+71
-11
lines changed

servo/components/plugins/lints/unrooted_must_root.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1215,7 +1215,7 @@ tcx
12151215
hir
12161216
:
12171217
:
1218-
Expr
1218+
Body
12191219
span
12201220
:
12211221
codemap
@@ -1389,8 +1389,6 @@ span_lint
13891389
UNROOTED_MUST_ROOT
13901390
arg
13911391
.
1392-
ty
1393-
.
13941392
span
13951393
"
13961394
Type
@@ -1463,7 +1461,10 @@ walk_expr
14631461
&
14641462
mut
14651463
visitor
1464+
&
14661465
body
1466+
.
1467+
value
14671468
)
14681469
;
14691470
}
@@ -2002,7 +2003,7 @@ body
20022003
hir
20032004
:
20042005
:
2005-
ExprId
2006+
BodyId
20062007
span
20072008
:
20082009
codemap

servo/components/plugins/utils.rs

Lines changed: 65 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,23 @@ PathSegment
376376
{
377377
parameters
378378
:
379+
Some
380+
(
381+
ref
382+
params
383+
)
384+
.
385+
.
386+
}
387+
)
388+
=
389+
>
390+
{
391+
match
392+
*
393+
*
394+
params
395+
{
379396
ast
380397
:
381398
:
@@ -387,22 +404,64 @@ AngleBracketed
387404
ref
388405
a
389406
)
390-
.
391-
.
392-
}
393-
)
394407
=
395408
>
396-
{
397409
Some
398410
(
399411
&
400412
a
401413
.
402414
types
403415
)
404-
}
416+
/
417+
/
418+
Foo
419+
(
420+
A
421+
B
422+
)
423+
-
424+
>
425+
C
426+
ast
427+
:
428+
:
429+
PathParameters
430+
:
431+
:
432+
Parenthesized
433+
(
405434
_
435+
)
436+
=
437+
>
438+
None
439+
}
440+
}
441+
Some
442+
(
443+
&
444+
ast
445+
:
446+
:
447+
PathSegment
448+
{
449+
parameters
450+
:
451+
None
452+
.
453+
.
454+
}
455+
)
456+
=
457+
>
458+
Some
459+
(
460+
&
461+
[
462+
]
463+
)
464+
None
406465
=
407466
>
408467
None

servo/rust-nightly-date

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
-
33
12
44
-
5-
19
5+
29

0 commit comments

Comments
 (0)