Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

2
tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servodriver.py
View file

@ -106,7 +106,7 @@ class ServoWebDriverBrowser(Browser):
self.binary,
self.binary_args + [
"--hard-fail",
"--webdriver", str(self.webdriver_port),
"--webdriver=%s" % self.webdriver_port,
"about:blank",
],
self.debug_info

2
tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/webdriver_server.py
View file

@ -197,7 +197,7 @@ class ServoDriverServer(WebDriverServer):
def make_command(self):
command = [self.binary,
"--webdriver", str(self.port),
"--webdriver=%s" % self.port,
"--hard-fail",
"--headless"] + self._args
if self.binary_args: