Skip to content

Commit e93aa3a

Browse files
borsbors
committed
Auto merge of #43307 - alexcrichton:beta-next, r=alexcrichton
[beta] Prepare the 1.20.0 beta release This commit prepares the freshly branched `beta` branch to start bootstrapping from the 1.19.0 preview artifacts as well as build in beta mode. Closes #43200 Closes #43218
2 parents 2652ce6 + b15382f commit e93aa3a

File tree

12 files changed

+36
-443
lines changed

12 files changed

+36
-443
lines changed

‎src/Cargo.lock

Lines changed: 0 additions & 301 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Cargo.toml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,6 @@ members = [
1616
"tools/remote-test-server",
1717
"tools/rust-installer",
1818
"tools/cargo",
19-
"tools/rls",
20-
# FIXME(https://github.com/rust-lang/cargo/issues/4089): move these to exclude
21-
"tools/rls/test_data/borrow_error",
22-
"tools/rls/test_data/completion",
23-
"tools/rls/test_data/find_all_refs",
24-
"tools/rls/test_data/find_all_refs_no_cfg_test",
25-
"tools/rls/test_data/goto_def",
26-
"tools/rls/test_data/highlight",
27-
"tools/rls/test_data/hover",
28-
"tools/rls/test_data/rename",
29-
"tools/rls/test_data/reformat",
30-
"tools/rls/test_data/bin_lib_no_cfg_test",
31-
"tools/rls/test_data/multiple_bins",
32-
"tools/rls/test_data/bin_lib",
33-
"tools/rls/test_data/reformat_with_range",
3419
]
3520

3621
# Curiously, compiletest will segfault if compiled with opt-level=3 on 64-bit
@@ -49,6 +34,3 @@ debug-assertions = false
4934
[profile.test]
5035
debug = false
5136
debug-assertions = false
52-
53-
[replace]
54-
"https://github.com/rust-lang/cargo#0.21.0" = { path = "tools/cargo" }

‎src/bootstrap/dist.rs

Lines changed: 1 addition & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -824,9 +824,6 @@ pub fn extended(build: &Build, stage: u32, target: &str) {
824824
let cargo_installer = dist.join(format!("{}-{}.tar.gz",
825825
pkgname(build, "cargo"),
826826
target));
827-
let rls_installer = dist.join(format!("{}-{}.tar.gz",
828-
pkgname(build, "rls"),
829-
target));
830827
let analysis_installer = dist.join(format!("{}-{}.tar.gz",
831828
pkgname(build, "rust-analysis"),
832829
target));
@@ -857,7 +854,7 @@ pub fn extended(build: &Build, stage: u32, target: &str) {
857854
// upgrades rustc was upgraded before rust-std. To avoid rustc clobbering
858855
// the std files during uninstall. To do this ensure that rustc comes
859856
// before rust-std in the list below.
860-
let mut tarballs = vec![rustc_installer, cargo_installer, rls_installer,
857+
let mut tarballs = vec![rustc_installer, cargo_installer,
861858
analysis_installer, docs_installer, std_installer];
862859
if target.contains("pc-windows-gnu") {
863860
tarballs.push(mingw_installer);
@@ -904,8 +901,6 @@ pub fn extended(build: &Build, stage: u32, target: &str) {
904901
t!(fs::create_dir_all(pkg.join("cargo")));
905902
t!(fs::create_dir_all(pkg.join("rust-docs")));
906903
t!(fs::create_dir_all(pkg.join("rust-std")));
907-
t!(fs::create_dir_all(pkg.join("rls")));
908-
t!(fs::create_dir_all(pkg.join("rust-analysis")));
909904

910905
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rustc"), target)),
911906
&pkg.join("rustc"));
@@ -915,17 +910,11 @@ pub fn extended(build: &Build, stage: u32, target: &str) {
915910
&pkg.join("rust-docs"));
916911
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rust-std"), target)),
917912
&pkg.join("rust-std"));
918-
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rls"), target)),
919-
&pkg.join("rls"));
920-
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rust-analysis"), target)),
921-
&pkg.join("rust-analysis"));
922913

923914
install(&etc.join("pkg/postinstall"), &pkg.join("rustc"), 0o755);
924915
install(&etc.join("pkg/postinstall"), &pkg.join("cargo"), 0o755);
925916
install(&etc.join("pkg/postinstall"), &pkg.join("rust-docs"), 0o755);
926917
install(&etc.join("pkg/postinstall"), &pkg.join("rust-std"), 0o755);
927-
install(&etc.join("pkg/postinstall"), &pkg.join("rls"), 0o755);
928-
install(&etc.join("pkg/postinstall"), &pkg.join("rust-analysis"), 0o755);
929918

930919
let pkgbuild = |component: &str| {
931920
let mut cmd = Command::new("pkgbuild");
@@ -939,8 +928,6 @@ pub fn extended(build: &Build, stage: u32, target: &str) {
939928
pkgbuild("cargo");
940929
pkgbuild("rust-docs");
941930
pkgbuild("rust-std");
942-
pkgbuild("rls");
943-
pkgbuild("rust-analysis");
944931

945932
// create an 'uninstall' package
946933
install(&etc.join("pkg/postinstall"), &pkg.join("uninstall"), 0o755);
@@ -964,8 +951,6 @@ pub fn extended(build: &Build, stage: u32, target: &str) {
964951
let _ = fs::remove_dir_all(&exe);
965952
t!(fs::create_dir_all(exe.join("rustc")));
966953
t!(fs::create_dir_all(exe.join("cargo")));
967-
t!(fs::create_dir_all(exe.join("rls")));
968-
t!(fs::create_dir_all(exe.join("rust-analysis")));
969954
t!(fs::create_dir_all(exe.join("rust-docs")));
970955
t!(fs::create_dir_all(exe.join("rust-std")));
971956
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rustc"), target))
@@ -980,19 +965,11 @@ pub fn extended(build: &Build, stage: u32, target: &str) {
980965
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rust-std"), target))
981966
.join(format!("rust-std-{}", target)),
982967
&exe.join("rust-std"));
983-
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rls"), target))
984-
.join("rls"),
985-
&exe.join("rls"));
986-
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rust-analysis"), target))
987-
.join(format!("rust-analysis-{}", target)),
988-
&exe.join("rust-analysis"));
989968

990969
t!(fs::remove_file(exe.join("rustc/manifest.in")));
991970
t!(fs::remove_file(exe.join("cargo/manifest.in")));
992971
t!(fs::remove_file(exe.join("rust-docs/manifest.in")));
993972
t!(fs::remove_file(exe.join("rust-std/manifest.in")));
994-
t!(fs::remove_file(exe.join("rls/manifest.in")));
995-
t!(fs::remove_file(exe.join("rust-analysis/manifest.in")));
996973

997974
if target.contains("windows-gnu") {
998975
t!(fs::create_dir_all(exe.join("rust-mingw")));
@@ -1066,26 +1043,6 @@ pub fn extended(build: &Build, stage: u32, target: &str) {
10661043
.arg("-dr").arg("Std")
10671044
.arg("-var").arg("var.StdDir")
10681045
.arg("-out").arg(exe.join("StdGroup.wxs")));
1069-
build.run(Command::new(&heat)
1070-
.current_dir(&exe)
1071-
.arg("dir")
1072-
.arg("rls")
1073-
.args(&heat_flags)
1074-
.arg("-cg").arg("RlsGroup")
1075-
.arg("-dr").arg("Rls")
1076-
.arg("-var").arg("var.RlsDir")
1077-
.arg("-out").arg(exe.join("RlsGroup.wxs"))
1078-
.arg("-t").arg(etc.join("msi/remove-duplicates.xsl")));
1079-
build.run(Command::new(&heat)
1080-
.current_dir(&exe)
1081-
.arg("dir")
1082-
.arg("rust-analysis")
1083-
.args(&heat_flags)
1084-
.arg("-cg").arg("AnalysisGroup")
1085-
.arg("-dr").arg("Analysis")
1086-
.arg("-var").arg("var.AnalysisDir")
1087-
.arg("-out").arg(exe.join("AnalysisGroup.wxs"))
1088-
.arg("-t").arg(etc.join("msi/remove-duplicates.xsl")));
10891046
if target.contains("windows-gnu") {
10901047
build.run(Command::new(&heat)
10911048
.current_dir(&exe)
@@ -1109,8 +1066,6 @@ pub fn extended(build: &Build, stage: u32, target: &str) {
11091066
.arg("-dDocsDir=rust-docs")
11101067
.arg("-dCargoDir=cargo")
11111068
.arg("-dStdDir=rust-std")
1112-
.arg("-dRlsDir=rls")
1113-
.arg("-dAnalysisDir=rust-analysis")
11141069
.arg("-arch").arg(&arch)
11151070
.arg("-out").arg(&output)
11161071
.arg(&input);
@@ -1128,8 +1083,6 @@ pub fn extended(build: &Build, stage: u32, target: &str) {
11281083
candle("DocsGroup.wxs".as_ref());
11291084
candle("CargoGroup.wxs".as_ref());
11301085
candle("StdGroup.wxs".as_ref());
1131-
candle("RlsGroup.wxs".as_ref());
1132-
candle("AnalysisGroup.wxs".as_ref());
11331086

11341087
if target.contains("windows-gnu") {
11351088
candle("GccGroup.wxs".as_ref());
@@ -1152,8 +1105,6 @@ pub fn extended(build: &Build, stage: u32, target: &str) {
11521105
.arg("DocsGroup.wixobj")
11531106
.arg("CargoGroup.wixobj")
11541107
.arg("StdGroup.wixobj")
1155-
.arg("RlsGroup.wixobj")
1156-
.arg("AnalysisGroup.wixobj")
11571108
.current_dir(&exe);
11581109

11591110
if target.contains("windows-gnu") {
@@ -1220,7 +1171,6 @@ pub fn hash_and_sign(build: &Build) {
12201171
cmd.arg(today.trim());
12211172
cmd.arg(build.rust_package_vers());
12221173
cmd.arg(build.package_vers(&build.release_num("cargo")));
1223-
cmd.arg(build.package_vers(&build.release_num("rls")));
12241174
cmd.arg(addr);
12251175

12261176
t!(fs::create_dir_all(distdir(build)));

‎src/bootstrap/mk/Makefile.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ check-aux:
5656
$(Q)$(BOOTSTRAP) test \
5757
src/tools/cargotest \
5858
src/tools/cargo \
59-
src/tools/rls \
6059
src/test/pretty \
6160
src/test/run-pass/pretty \
6261
src/test/run-fail/pretty \

‎src/bootstrap/step.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,6 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules {
605605
.run(move |s| compile::tool(build, s.stage, s.target, "cargo"));
606606
rules.build("tool-rls", "src/tools/rls")
607607
.host(true)
608-
.default(build.config.extended)
609608
.dep(|s| s.name("librustc-tool"))
610609
.dep(|s| s.stage(0).host(s.target).name("openssl"))
611610
.dep(move |s| {
@@ -807,7 +806,6 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules {
807806
.dep(|d| d.name("dist-mingw"))
808807
.dep(|d| d.name("dist-docs"))
809808
.dep(|d| d.name("dist-cargo"))
810-
.dep(|d| d.name("dist-rls"))
811809
.dep(|d| d.name("dist-analysis"))
812810
.dep(move |s| tool_rust_installer(build, s))
813811
.run(move |s| dist::extended(build, s.stage, s.target));
@@ -836,7 +834,6 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules {
836834
.dep(|s| s.name("dist-cargo"))
837835
.run(move |s| install::Installer::new(build).install_cargo(s.stage, s.target));
838836
rules.install("install-rls", "rls")
839-
.default(build.config.extended)
840837
.host(true)
841838
.only_host_build(true)
842839
.dep(|s| s.name("dist-rls"))

‎src/ci/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ fi
4444
# FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
4545
# either automatically or manually.
4646
if [ "$DEPLOY$DEPLOY_ALT" != "" ]; then
47-
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=nightly"
47+
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=beta"
4848
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp"
4949

5050
if [ "$NO_LLVM_ASSERTIONS" = "1" ]; then

‎src/etc/installer/exe/rust.iss

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ Name: gcc; Description: "Linker and platform libraries"; Types: full
4646
Name: docs; Description: "HTML documentation"; Types: full
4747
Name: cargo; Description: "Cargo, the Rust package manager"; Types: full
4848
Name: std; Description: "The Rust Standard Library"; Types: full
49-
Name: rls; Description: "RLS, the Rust Language Server"
5049

5150
[Files]
5251
Source: "rustc/*.*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs; Components: rust
@@ -56,8 +55,6 @@ Source: "rust-mingw/*.*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs;
5655
Source: "rust-docs/*.*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs; Components: docs
5756
Source: "cargo/*.*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs; Components: cargo
5857
Source: "rust-std/*.*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs; Components: std
59-
Source: "rls/*.*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs; Components: rls
60-
Source: "rust-analysis/*.*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs; Components: rls
6158

6259
[Code]
6360
const

‎src/etc/installer/msi/rust.wxs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,6 @@
170170
<Directory Id="Docs" Name="." />
171171
<Directory Id="Cargo" Name="." />
172172
<Directory Id="Std" Name="." />
173-
<Directory Id="Rls" Name="." />
174-
<Directory Id="Analysis" Name="." />
175173
</Directory>
176174
</Directory>
177175

@@ -275,14 +273,6 @@
275273
<ComponentRef Id="PathEnvPerMachine" />
276274
<ComponentRef Id="PathEnvPerUser" />
277275
</Feature>
278-
<Feature Id="RLS"
279-
Title="RLS, the Rust Language Server"
280-
Display="7"
281-
Level="2"
282-
AllowAdvertise="no">
283-
<ComponentGroupRef Id="RlsGroup" />
284-
<ComponentGroupRef Id="AnalysisGroup" />
285-
</Feature>
286276

287277
<UIRef Id="RustUI" />
288278
</Product>

‎src/etc/installer/pkg/Distribution.xml

Lines changed: 29 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -12,70 +12,59 @@
1212
</volume-check>
1313
<choices-outline>
1414
<line choice="install">
15-
<line choice="rustc"/>
16-
<line choice="rust-std"/>
17-
<line choice="cargo"/>
18-
<line choice="rust-docs"/>
19-
<line choice="rls"/>
15+
<line choice="rustc"/>
16+
<line choice="rust-std"/>
17+
<line choice="cargo"/>
18+
<line choice="rust-docs"/>
2019
</line>
2120
<line choice="uninstall" />
2221
</choices-outline>
2322
<!--
24-
These 'selected' scripts ensure that install and uninstall can never be selected at
25-
the same time. Exectly how they work is pretty mysterious, tied to the unspecified algorithm
26-
the installer uses to traverse the options after one is toggled.
23+
These 'selected' scripts ensure that install and uninstall can never be selected at
24+
the same time. Exectly how they work is pretty mysterious, tied to the unspecified algorithm
25+
the installer uses to traverse the options after one is toggled.
2726
-->
2827
<choice id="install" visible="true"
29-
title="Install Rust" description="Install the Rust compiler, package manager and documentation."
30-
customLocation="/usr/local"
31-
selected="!choices.uninstall.selected"
32-
/>
28+
title="Install Rust" description="Install the Rust compiler, package manager and documentation."
29+
customLocation="/usr/local"
30+
selected="!choices.uninstall.selected"
31+
/>
3332
<choice id="uninstall" visible="true"
34-
title="Uninstall Rust" description="Select this option to uninstall an existing Rust installation."
35-
customLocation="/usr/local"
36-
selected="!(choices.install.selected || choices.rustc.selected || choices.cargo.selected || choices['rust-docs'].selected)"
37-
start_selected="false"
38-
>
39-
<pkg-ref id="org.rust-lang.uninstall"/>
33+
title="Uninstall Rust" description="Select this option to uninstall an existing Rust installation."
34+
customLocation="/usr/local"
35+
selected="!(choices.install.selected || choices.rustc.selected || choices.cargo.selected || choices['rust-docs'].selected)"
36+
start_selected="false"
37+
>
38+
<pkg-ref id="org.rust-lang.uninstall" />
4039
</choice>
4140
<choice id="rustc" visible="true"
42-
title="Compiler" description="rustc, the Rust compiler, and rustdoc, the API documentation tool."
43-
selected="(!choices.uninstall.selected &amp;&amp; choices.rustc.selected) || (choices.uninstall.selected &amp;&amp; choices.install.selected)"
44-
>
41+
title="Compiler" description="rustc, the Rust compiler, and rustdoc, the API documentation tool."
42+
selected="(!choices.uninstall.selected &amp;&amp; choices.rustc.selected) || (choices.uninstall.selected &amp;&amp; choices.install.selected)"
43+
>
4544
<pkg-ref id="org.rust-lang.rustc"/>
4645
</choice>
4746
<choice id="cargo" visible="true"
48-
title="Cargo" description="cargo, the Rust package manager."
49-
selected="(!choices.uninstall.selected &amp;&amp; choices.cargo.selected) || (choices.uninstall.selected &amp;&amp; choices.install.selected)"
50-
>
47+
title="Cargo" description="cargo, the Rust package manager."
48+
selected="(!choices.uninstall.selected &amp;&amp; choices.cargo.selected) || (choices.uninstall.selected &amp;&amp; choices.install.selected)"
49+
>
5150
<pkg-ref id="org.rust-lang.cargo"/>
5251
</choice>
5352
<choice id="rust-std" visible="true"
54-
title="Standard Library" description="The Rust standard library."
55-
selected="(!choices.uninstall.selected &amp;&amp; choices['rust-std'].selected) || (choices.uninstall.selected &amp;&amp; choices.install.selected)"
56-
>
53+
title="Standard Library" description="The Rust standard library."
54+
selected="(!choices.uninstall.selected &amp;&amp; choices['rust-std'].selected) || (choices.uninstall.selected &amp;&amp; choices.install.selected)"
55+
>
5756
<pkg-ref id="org.rust-lang.rust-std"/>
5857
</choice>
5958
<choice id="rust-docs" visible="true"
60-
title="Documentation" description="HTML documentation."
61-
selected="(!choices.uninstall.selected &amp;&amp; choices['rust-docs'].selected) || (choices.uninstall.selected &amp;&amp; choices.install.selected)"
62-
>
59+
title="Documentation" description="HTML documentation."
60+
selected="(!choices.uninstall.selected &amp;&amp; choices['rust-docs'].selected) || (choices.uninstall.selected &amp;&amp; choices.install.selected)"
61+
>
6362
<pkg-ref id="org.rust-lang.rust-docs"/>
6463
</choice>
65-
<choice id="rls" visible="true"
66-
title="RLS" description="RLS, the Rust Language Server"
67-
selected="(!choices.uninstall.selected &amp;&amp; choices['rls'].selected) || (choices.uninstall.selected &amp;&amp; choices.install.selected)"
68-
start_selected="false"
69-
>
70-
<pkg-ref id="org.rust-lang.rls"/>
71-
<pkg-ref id="org.rust-lang.rust-analysis"/>
72-
</choice>
7364
<pkg-ref id="org.rust-lang.rustc" version="0" onConclusion="none">rustc.pkg</pkg-ref>
7465
<pkg-ref id="org.rust-lang.cargo" version="0" onConclusion="none">cargo.pkg</pkg-ref>
7566
<pkg-ref id="org.rust-lang.rust-docs" version="0" onConclusion="none">rust-docs.pkg</pkg-ref>
7667
<pkg-ref id="org.rust-lang.rust-std" version="0" onConclusion="none">rust-std.pkg</pkg-ref>
77-
<pkg-ref id="org.rust-lang.rls" version="0" onConclusion="none">rls.pkg</pkg-ref>
78-
<pkg-ref id="org.rust-lang.rust-analysis" version="0" onConclusion="none">rust-analysis.pkg</pkg-ref>
7968
<pkg-ref id="org.rust-lang.uninstall" version="0" onConclusion="none">uninstall.pkg</pkg-ref>
8069
<background file="rust-logo.png" mime-type="image/png"
8170
alignment="bottomleft"/>

‎src/stage0.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
# source tarball for a stable release you'll likely see `1.x.0` for rustc and
1313
# `0.x.0` for Cargo where they were released on `date`.
1414

15-
date: 2017-06-15
16-
rustc: beta
17-
cargo: beta
15+
date: 2017-07-18
16+
rustc: 1.19.0
17+
cargo: 0.20.0
1818

1919
# When making a stable release the process currently looks like:
2020
#
@@ -34,4 +34,4 @@ cargo: beta
3434
# looking at a beta source tarball and it's uncommented we'll shortly comment it
3535
# out.
3636

37-
#dev: 1
37+
dev: 1

0 commit comments

Comments
 (0)