diff --git a/servo/etc/ci/buildbot_steps.yml b/servo/etc/ci/buildbot_steps.yml index d431b95f824a6..5ca8f67822737 100644 --- a/servo/etc/ci/buildbot_steps.yml +++ b/servo/etc/ci/buildbot_steps.yml @@ -814,9 +814,6 @@ zlib lib / pkgconfig -SERVO_RUSTC_LLVM_ASSERTIONS -= -1 . / mach @@ -826,9 +823,6 @@ build dev - env -SERVO_RUSTC_LLVM_ASSERTIONS -= -1 . / mach @@ -837,9 +831,6 @@ test unit - env -SERVO_RUSTC_LLVM_ASSERTIONS -= -1 . / mach @@ -849,9 +840,6 @@ package dev - env -SERVO_RUSTC_LLVM_ASSERTIONS -= -1 . / mach @@ -1440,9 +1428,6 @@ self test - env -SERVO_RUSTC_LLVM_ASSERTIONS -= -1 . / mach @@ -1452,9 +1437,6 @@ build dev - env -SERVO_RUSTC_LLVM_ASSERTIONS -= -1 . / mach @@ -1463,9 +1445,6 @@ test compiletest - env -SERVO_RUSTC_LLVM_ASSERTIONS -= -1 . / mach @@ -1474,9 +1453,6 @@ test unit - env -SERVO_RUSTC_LLVM_ASSERTIONS -= -1 . / mach @@ -1486,9 +1462,6 @@ package dev - env -SERVO_RUSTC_LLVM_ASSERTIONS -= -1 . / mach @@ -1497,9 +1470,6 @@ build cef - env -SERVO_RUSTC_LLVM_ASSERTIONS -= -1 . / mach @@ -1988,9 +1958,6 @@ keep force - env -SERVO_RUSTC_LLVM_ASSERTIONS -= -1 ANDROID_SDK = / @@ -2019,9 +1986,6 @@ android dev - env -SERVO_RUSTC_LLVM_ASSERTIONS -= -1 ANDROID_SDK = / @@ -2101,9 +2065,6 @@ keep force - env -SERVO_RUSTC_LLVM_ASSERTIONS -= -1 ANDROID_SDK = / @@ -2132,9 +2093,6 @@ android release - env -SERVO_RUSTC_LLVM_ASSERTIONS -= -1 ANDROID_SDK = / @@ -2187,9 +2145,6 @@ keep force - env -SERVO_RUSTC_LLVM_ASSERTIONS -= -1 . / mach @@ -2248,9 +2203,6 @@ keep force - env -SERVO_RUSTC_LLVM_ASSERTIONS -= -1 . / mach diff --git a/servo/python/servo/bootstrap_commands.py b/servo/python/servo/bootstrap_commands.py index 99d70cdba0ea2..997bff528fa0b 100644 --- a/servo/python/servo/bootstrap_commands.py +++ b/servo/python/servo/bootstrap_commands.py @@ -71,7 +71,6 @@ util import STATIC_RUST_LANG_ORG_DIST -URLOPEN_KWARGS CommandProvider class MachCommands @@ -560,113 +559,12 @@ = STATIC_RUST_LANG_ORG_DIST -elif -self -. -config -[ -" -build -" -] -[ -" -llvm -- -assertions -" -] -: - -base_url -= -nightly_dist - else : -import -toml - -channel -= -nightly_dist -+ -" -/ -channel -- -rust -- -nightly -. -toml -" - -manifest -= -toml -. -load -( -urllib2 -. -urlopen -( -channel -* -* -URLOPEN_KWARGS -) -) - -nightly_commit_hash -= -manifest -[ -" -pkg -" -] -[ -" -rustc -" -] -[ -" -git_commit_hash -" -] - base_url = -" -https -: -/ -/ -s3 -. -amazonaws -. -com -/ -rust -- -lang -- -ci -/ -rustc -- -builds -- -alt -/ -" -+ -nightly_commit_hash +nightly_dist rustc_url = diff --git a/servo/python/servo/command_base.py b/servo/python/servo/command_base.py index a4da8bcc77fb3..e7a71df1d22d8 100644 --- a/servo/python/servo/command_base.py +++ b/servo/python/servo/command_base.py @@ -1801,60 +1801,6 @@ ) ) -triples_with_rustc_alt_builds -= -[ - -" -x86_64 -- -unknown -- -linux -- -gnu -" - -" -x86_64 -- -apple -- -darwin -" - -" -x86_64 -- -pc -- -windows -- -msvc -" - -] - -llvm_assertions_default -= -( -" -SERVO_RUSTC_LLVM_ASSERTIONS -" -in -os -. -environ - -or -host_triple -( -) -not -in -triples_with_rustc_alt_builds -) - self . config @@ -1903,25 +1849,6 @@ " ) -self -. -config -[ -" -build -" -] -. -setdefault -( -" -llvm -- -assertions -" -llvm_assertions_default -) - self . config @@ -2301,37 +2228,6 @@ ( ) -elif -not -self -. -config -[ -" -build -" -] -[ -" -llvm -- -assertions -" -] -: - -return -self -. -rust_nightly_date -( -) -+ -" -- -alt -" - else : diff --git a/servo/rust-toolchain b/servo/rust-toolchain index fb5e06b3851e0..5d6cbb74a8200 100644 --- a/servo/rust-toolchain +++ b/servo/rust-toolchain @@ -4,4 +4,4 @@ nightly - 11 - -09 +14 diff --git a/servo/servobuild.example b/servo/servobuild.example index da498a10709ba..1174fc7dd1f1b 100644 --- a/servo/servobuild.example +++ b/servo/servobuild.example @@ -378,21 +378,6 @@ mode dev " # -Whether -to -enable -LLVM -assertions -in -rustc -. -# -llvm -- -assertions -= -false -# Set " android