Skip to content

Commit 5eadcc1

Browse files
committed
DO NOT MERGE: switch to stable channel for try builds
1 parent 6627cbb commit 5eadcc1

File tree

2 files changed

+1
-35
lines changed

2 files changed

+1
-35
lines changed

src/bootstrap/lib.rs

-34
Original file line numberDiff line numberDiff line change
@@ -1051,40 +1051,6 @@ impl Build {
10511051
self.package_vers(&self.version)
10521052
}
10531053

1054-
/// Returns the value of `package_vers` above for Cargo
1055-
fn cargo_package_vers(&self) -> String {
1056-
self.package_vers(&self.release_num("cargo"))
1057-
}
1058-
1059-
/// Returns the value of `package_vers` above for rls
1060-
fn rls_package_vers(&self) -> String {
1061-
self.package_vers(&self.release_num("rls"))
1062-
}
1063-
1064-
/// Returns the value of `package_vers` above for rust-analyzer
1065-
fn rust_analyzer_package_vers(&self) -> String {
1066-
self.package_vers(&self.release_num("rust-analyzer/crates/rust-analyzer"))
1067-
}
1068-
1069-
/// Returns the value of `package_vers` above for clippy
1070-
fn clippy_package_vers(&self) -> String {
1071-
self.package_vers(&self.release_num("clippy"))
1072-
}
1073-
1074-
/// Returns the value of `package_vers` above for miri
1075-
fn miri_package_vers(&self) -> String {
1076-
self.package_vers(&self.release_num("miri"))
1077-
}
1078-
1079-
/// Returns the value of `package_vers` above for rustfmt
1080-
fn rustfmt_package_vers(&self) -> String {
1081-
self.package_vers(&self.release_num("rustfmt"))
1082-
}
1083-
1084-
fn llvm_tools_package_vers(&self) -> String {
1085-
self.package_vers(&self.version)
1086-
}
1087-
10881054
fn llvm_tools_vers(&self) -> String {
10891055
self.rust_version()
10901056
}

src/ci/run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ fi
6363
#
6464
# FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
6565
# either automatically or manually.
66-
export RUST_RELEASE_CHANNEL=nightly
66+
export RUST_RELEASE_CHANNEL=stable
6767

6868
# Always set the release channel for bootstrap; this is normally not important (i.e., only dist
6969
# builds would seem to matter) but in practice bootstrap wants to know whether we're targeting

0 commit comments

Comments
 (0)