servo: Merge #19213 - Stop using "alternate" rustc builds (from servo…

…:nightly); r=nox

With rust-lang/rust#45810, normal Nightly now has LLVM assertions disabled.

This allows us to entirely stop relying on private/unstable Rust CI artifacts being and remaining available: https://internals.rust-lang.org/t/public-stable-rust-services/6072

Source-Repo: https://github.com/servo/servo
Source-Revision: 856dc3c90ab920880e0bdca171720f37e40dd597

UltraBlame original commit: 6406e73a24bca7b3355ff438c283fe0bd20afdaf

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

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
 =