diff options
| author | bors-servo <servo-ops@mozilla.com> | 2021-02-25 00:11:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-25 00:11:29 -0500 |
| commit | 19d1544b66ffad08d3484d0a4770d86f48d9651e (patch) | |
| tree | 9fcfa1bf20b03e93d125f278cc513544a97335ea /python | |
| parent | 9a6ae55fd34e529844e5703d47f36f7f7623496a (diff) | |
| parent | ee74a64f537f0899f4913ab7d3907889f37b1150 (diff) | |
| download | servo-19d1544b66ffad08d3484d0a4770d86f48d9651e.tar.gz servo-19d1544b66ffad08d3484d0a4770d86f48d9651e.zip | |
Auto merge of #27619 - servo:rustup, r=jdm
Upgrade to rustc 1.48.0-nightly (623fb90b5 2020-09-26)
https://github.com/rust-lang/hashbrown/pull/159 reduced `size_of::<HashMap>()`
Diffstat (limited to 'python')
| -rw-r--r-- | python/servo/command_base.py | 7 | ||||
| -rw-r--r-- | python/servo/packages.py | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index fb1c79b8b3c..9f63a579f48 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -1028,7 +1028,12 @@ install them, let us know by filing a bug!") def ensure_rustup_version(self): try: - version_line = subprocess.check_output(["rustup" + BIN_SUFFIX, "--version"]) + version_line = subprocess.check_output( + ["rustup" + BIN_SUFFIX, "--version"], + # Silence "info: This is the version for the rustup toolchain manager, + # not the rustc compiler." + stderr=open(os.devnull, "wb") + ) except OSError as e: if e.errno == NO_SUCH_FILE_OR_DIRECTORY: print("It looks like rustup is not installed. See instructions at " diff --git a/python/servo/packages.py b/python/servo/packages.py index aa3e16601aa..6a7b375964f 100644 --- a/python/servo/packages.py +++ b/python/servo/packages.py @@ -11,5 +11,5 @@ WINDOWS_MSVC = { "openssl": "111.3.0+1.1.1c-vs2017-2019-09-18", "gstreamer-uwp": "1.16.0.5", "openxr-loader-uwp": "1.0", - "xargo": "v0.3.17", + "xargo": "v0.3.22", } |