Skip to content

Commit 1981099

Browse files
borsbors
committed
Auto merge of #44130 - alexcrichton:beta-next, r=alexcrichton
Prepare the 1.21.0 beta1 release
2 parents e266888 + ccb7c55 commit 1981099

File tree

11 files changed

+8
-461
lines changed

11 files changed

+8
-461
lines changed

‎src/Cargo.lock

-341
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Cargo.toml

-23
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,6 @@ members = [
1717
"tools/rust-installer",
1818
"tools/cargo",
1919
"tools/rustdoc",
20-
"tools/rls",
21-
# FIXME(https://github.com/rust-lang/cargo/issues/4089): move these to exclude
22-
"tools/rls/test_data/borrow_error",
23-
"tools/rls/test_data/completion",
24-
"tools/rls/test_data/find_all_refs",
25-
"tools/rls/test_data/find_all_refs_no_cfg_test",
26-
"tools/rls/test_data/goto_def",
27-
"tools/rls/test_data/highlight",
28-
"tools/rls/test_data/hover",
29-
"tools/rls/test_data/rename",
30-
"tools/rls/test_data/reformat",
31-
"tools/rls/test_data/bin_lib_no_cfg_test",
32-
"tools/rls/test_data/multiple_bins",
33-
"tools/rls/test_data/bin_lib",
34-
"tools/rls/test_data/reformat_with_range",
35-
"tools/rls/test_data/find_impls",
36-
"tools/rls/test_data/infer_bin",
37-
"tools/rls/test_data/infer_custom_bin",
38-
"tools/rls/test_data/infer_lib",
39-
"tools/rls/test_data/omit_init_build",
4020
]
4121

4222
# Curiously, compiletest will segfault if compiled with opt-level=3 on 64-bit
@@ -55,6 +35,3 @@ debug-assertions = false
5535
[profile.test]
5636
debug = false
5737
debug-assertions = false
58-
59-
[replace]
60-
"https://github.com/rust-lang/cargo#0.22.0" = { path = "tools/cargo" }

‎src/bootstrap/dist.rs

+1-49
Original file line numberDiff line numberDiff line change
@@ -1126,7 +1126,6 @@ impl Step for Extended {
11261126
compiler: builder.compiler(stage, target),
11271127
});
11281128
let cargo_installer = builder.ensure(Cargo { stage, target });
1129-
let rls_installer = builder.ensure(Rls { stage, target });
11301129
let mingw_installer = builder.ensure(Mingw { host: target });
11311130
let analysis_installer = builder.ensure(Analysis {
11321131
compiler: builder.compiler(stage, self.host),
@@ -1156,7 +1155,7 @@ impl Step for Extended {
11561155
// upgrades rustc was upgraded before rust-std. To avoid rustc clobbering
11571156
// the std files during uninstall. To do this ensure that rustc comes
11581157
// before rust-std in the list below.
1159-
let mut tarballs = vec![rustc_installer, cargo_installer, rls_installer,
1158+
let mut tarballs = vec![rustc_installer, cargo_installer,
11601159
analysis_installer, docs_installer, std_installer];
11611160
if target.contains("pc-windows-gnu") {
11621161
tarballs.push(mingw_installer.unwrap());
@@ -1203,8 +1202,6 @@ impl Step for Extended {
12031202
t!(fs::create_dir_all(pkg.join("cargo")));
12041203
t!(fs::create_dir_all(pkg.join("rust-docs")));
12051204
t!(fs::create_dir_all(pkg.join("rust-std")));
1206-
t!(fs::create_dir_all(pkg.join("rls")));
1207-
t!(fs::create_dir_all(pkg.join("rust-analysis")));
12081205

12091206
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rustc"), target)),
12101207
&pkg.join("rustc"));
@@ -1214,17 +1211,11 @@ impl Step for Extended {
12141211
&pkg.join("rust-docs"));
12151212
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rust-std"), target)),
12161213
&pkg.join("rust-std"));
1217-
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rls"), target)),
1218-
&pkg.join("rls"));
1219-
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rust-analysis"), target)),
1220-
&pkg.join("rust-analysis"));
12211214

12221215
install(&etc.join("pkg/postinstall"), &pkg.join("rustc"), 0o755);
12231216
install(&etc.join("pkg/postinstall"), &pkg.join("cargo"), 0o755);
12241217
install(&etc.join("pkg/postinstall"), &pkg.join("rust-docs"), 0o755);
12251218
install(&etc.join("pkg/postinstall"), &pkg.join("rust-std"), 0o755);
1226-
install(&etc.join("pkg/postinstall"), &pkg.join("rls"), 0o755);
1227-
install(&etc.join("pkg/postinstall"), &pkg.join("rust-analysis"), 0o755);
12281219

12291220
let pkgbuild = |component: &str| {
12301221
let mut cmd = Command::new("pkgbuild");
@@ -1238,8 +1229,6 @@ impl Step for Extended {
12381229
pkgbuild("cargo");
12391230
pkgbuild("rust-docs");
12401231
pkgbuild("rust-std");
1241-
pkgbuild("rls");
1242-
pkgbuild("rust-analysis");
12431232

12441233
// create an 'uninstall' package
12451234
install(&etc.join("pkg/postinstall"), &pkg.join("uninstall"), 0o755);
@@ -1263,8 +1252,6 @@ impl Step for Extended {
12631252
let _ = fs::remove_dir_all(&exe);
12641253
t!(fs::create_dir_all(exe.join("rustc")));
12651254
t!(fs::create_dir_all(exe.join("cargo")));
1266-
t!(fs::create_dir_all(exe.join("rls")));
1267-
t!(fs::create_dir_all(exe.join("rust-analysis")));
12681255
t!(fs::create_dir_all(exe.join("rust-docs")));
12691256
t!(fs::create_dir_all(exe.join("rust-std")));
12701257
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rustc"), target))
@@ -1279,19 +1266,11 @@ impl Step for Extended {
12791266
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rust-std"), target))
12801267
.join(format!("rust-std-{}", target)),
12811268
&exe.join("rust-std"));
1282-
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rls"), target))
1283-
.join("rls"),
1284-
&exe.join("rls"));
1285-
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rust-analysis"), target))
1286-
.join(format!("rust-analysis-{}", target)),
1287-
&exe.join("rust-analysis"));
12881269

12891270
t!(fs::remove_file(exe.join("rustc/manifest.in")));
12901271
t!(fs::remove_file(exe.join("cargo/manifest.in")));
12911272
t!(fs::remove_file(exe.join("rust-docs/manifest.in")));
12921273
t!(fs::remove_file(exe.join("rust-std/manifest.in")));
1293-
t!(fs::remove_file(exe.join("rls/manifest.in")));
1294-
t!(fs::remove_file(exe.join("rust-analysis/manifest.in")));
12951274

12961275
if target.contains("windows-gnu") {
12971276
t!(fs::create_dir_all(exe.join("rust-mingw")));
@@ -1365,26 +1344,6 @@ impl Step for Extended {
13651344
.arg("-dr").arg("Std")
13661345
.arg("-var").arg("var.StdDir")
13671346
.arg("-out").arg(exe.join("StdGroup.wxs")));
1368-
build.run(Command::new(&heat)
1369-
.current_dir(&exe)
1370-
.arg("dir")
1371-
.arg("rls")
1372-
.args(&heat_flags)
1373-
.arg("-cg").arg("RlsGroup")
1374-
.arg("-dr").arg("Rls")
1375-
.arg("-var").arg("var.RlsDir")
1376-
.arg("-out").arg(exe.join("RlsGroup.wxs"))
1377-
.arg("-t").arg(etc.join("msi/remove-duplicates.xsl")));
1378-
build.run(Command::new(&heat)
1379-
.current_dir(&exe)
1380-
.arg("dir")
1381-
.arg("rust-analysis")
1382-
.args(&heat_flags)
1383-
.arg("-cg").arg("AnalysisGroup")
1384-
.arg("-dr").arg("Analysis")
1385-
.arg("-var").arg("var.AnalysisDir")
1386-
.arg("-out").arg(exe.join("AnalysisGroup.wxs"))
1387-
.arg("-t").arg(etc.join("msi/remove-duplicates.xsl")));
13881347
if target.contains("windows-gnu") {
13891348
build.run(Command::new(&heat)
13901349
.current_dir(&exe)
@@ -1408,8 +1367,6 @@ impl Step for Extended {
14081367
.arg("-dDocsDir=rust-docs")
14091368
.arg("-dCargoDir=cargo")
14101369
.arg("-dStdDir=rust-std")
1411-
.arg("-dRlsDir=rls")
1412-
.arg("-dAnalysisDir=rust-analysis")
14131370
.arg("-arch").arg(&arch)
14141371
.arg("-out").arg(&output)
14151372
.arg(&input);
@@ -1427,8 +1384,6 @@ impl Step for Extended {
14271384
candle("DocsGroup.wxs".as_ref());
14281385
candle("CargoGroup.wxs".as_ref());
14291386
candle("StdGroup.wxs".as_ref());
1430-
candle("RlsGroup.wxs".as_ref());
1431-
candle("AnalysisGroup.wxs".as_ref());
14321387

14331388
if target.contains("windows-gnu") {
14341389
candle("GccGroup.wxs".as_ref());
@@ -1451,8 +1406,6 @@ impl Step for Extended {
14511406
.arg("DocsGroup.wixobj")
14521407
.arg("CargoGroup.wixobj")
14531408
.arg("StdGroup.wixobj")
1454-
.arg("RlsGroup.wixobj")
1455-
.arg("AnalysisGroup.wixobj")
14561409
.current_dir(&exe);
14571410

14581411
if target.contains("windows-gnu") {
@@ -1537,7 +1490,6 @@ impl Step for HashSign {
15371490
cmd.arg(today.trim());
15381491
cmd.arg(build.rust_package_vers());
15391492
cmd.arg(build.package_vers(&build.release_num("cargo")));
1540-
cmd.arg(build.package_vers(&build.release_num("rls")));
15411493
cmd.arg(addr);
15421494

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

‎src/bootstrap/mk/Makefile.in

-1
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/tool.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -348,12 +348,11 @@ pub struct Rls {
348348

349349
impl Step for Rls {
350350
type Output = PathBuf;
351-
const DEFAULT: bool = true;
351+
const DEFAULT: bool = false;
352352
const ONLY_HOSTS: bool = true;
353353

354354
fn should_run(run: ShouldRun) -> ShouldRun {
355-
let builder = run.builder;
356-
run.path("src/tools/rls").default_condition(builder.build.config.extended)
355+
run.path("src/tools/rls")
357356
}
358357

359358
fn make_run(run: RunConfig) {

‎src/ci/run.sh

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

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

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

-3
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

-10
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

-11
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<line choice="rust-std"/>
1717
<line choice="cargo"/>
1818
<line choice="rust-docs"/>
19-
<line choice="rls"/>
2019
</line>
2120
<line choice="uninstall" />
2221
</choices-outline>
@@ -62,20 +61,10 @@
6261
>
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

+4-4
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-07-18
16-
rustc: beta
17-
cargo: beta
15+
date: 2017-08-27
16+
rustc: 1.20.0
17+
cargo: 0.21.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

‎src/tools/build-manifest/src/main.rs

-15
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ macro_rules! t {
157157
struct Builder {
158158
rust_release: String,
159159
cargo_release: String,
160-
rls_release: String,
161160
input: PathBuf,
162161
output: PathBuf,
163162
gpg_passphrase: String,
@@ -166,7 +165,6 @@ struct Builder {
166165
date: String,
167166
rust_version: String,
168167
cargo_version: String,
169-
rls_version: String,
170168
}
171169

172170
fn main() {
@@ -176,15 +174,13 @@ fn main() {
176174
let date = args.next().unwrap();
177175
let rust_release = args.next().unwrap();
178176
let cargo_release = args.next().unwrap();
179-
let rls_release = args.next().unwrap();
180177
let s3_address = args.next().unwrap();
181178
let mut passphrase = String::new();
182179
t!(io::stdin().read_to_string(&mut passphrase));
183180

184181
Builder {
185182
rust_release,
186183
cargo_release,
187-
rls_release,
188184
input,
189185
output,
190186
gpg_passphrase: passphrase,
@@ -193,15 +189,13 @@ fn main() {
193189
date,
194190
rust_version: String::new(),
195191
cargo_version: String::new(),
196-
rls_version: String::new(),
197192
}.build();
198193
}
199194

200195
impl Builder {
201196
fn build(&mut self) {
202197
self.rust_version = self.version("rust", "x86_64-unknown-linux-gnu");
203198
self.cargo_version = self.version("cargo", "x86_64-unknown-linux-gnu");
204-
self.rls_version = self.version("rls", "x86_64-unknown-linux-gnu");
205199

206200
self.digest_and_sign();
207201
let manifest = self.build_manifest();
@@ -239,7 +233,6 @@ impl Builder {
239233
self.package("rust-std", &mut manifest.pkg, TARGETS);
240234
self.package("rust-docs", &mut manifest.pkg, TARGETS);
241235
self.package("rust-src", &mut manifest.pkg, &["*"]);
242-
self.package("rls", &mut manifest.pkg, HOSTS);
243236
self.package("rust-analysis", &mut manifest.pkg, TARGETS);
244237

245238
let mut pkg = Package {
@@ -275,10 +268,6 @@ impl Builder {
275268
});
276269
}
277270

278-
extensions.push(Component {
279-
pkg: "rls".to_string(),
280-
target: host.to_string(),
281-
});
282271
extensions.push(Component {
283272
pkg: "rust-analysis".to_string(),
284273
target: host.to_string(),
@@ -353,8 +342,6 @@ impl Builder {
353342
format!("rust-src-{}.tar.gz", self.rust_release)
354343
} else if component == "cargo" {
355344
format!("cargo-{}-{}.tar.gz", self.cargo_release, target)
356-
} else if component == "rls" {
357-
format!("rls-{}-{}.tar.gz", self.rls_release, target)
358345
} else {
359346
format!("{}-{}-{}.tar.gz", component, self.rust_release, target)
360347
}
@@ -363,8 +350,6 @@ impl Builder {
363350
fn cached_version(&self, component: &str) -> &str {
364351
if component == "cargo" {
365352
&self.cargo_version
366-
} else if component == "rls" {
367-
&self.rls_version
368353
} else {
369354
&self.rust_version
370355
}

0 commit comments

Comments
 (0)