Auto merge of #21356 - servo:nll, r=jdm

Fix the build for NLL

Test with `RUSTFLAGS="-Zborrowck=mir -Ztwo-phase-borrows" cargo build`

https://internals.rust-lang.org/t/help-us-get-non-lexical-lifetimes-nll-over-the-finish-line/7807/7

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21356)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-08-24 12:13:09 -04:00 committed by GitHub
commit 39551199c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 37 additions and 32 deletions

View file

@ -642566,7 +642566,7 @@
"support"
],
"tools/wptrunner/wptrunner/browsers/servodriver.py": [
"6486a788b8c8fbf4fc52dd4368265571975cabb4",
"d788effc469bc2f582ba7ead65700e7a13c37c59",
"support"
],
"tools/wptrunner/wptrunner/browsers/webkit.py": [
@ -642814,7 +642814,7 @@
"support"
],
"tools/wptrunner/wptrunner/webdriver_server.py": [
"9ecd009a7d8127ed793d4ef0aff19f6161bbd1ec",
"4ec415ce78bb89a82d5f098b1c4e8560e7ec39e4",
"support"
],
"tools/wptrunner/wptrunner/wptcommandline.py": [