Skip to content

Commit 0473748

Browse files
borsbors
committed
Auto merge of #44204 - nrc:beta, r=alexcrichton
RLS on beta Reverts the RLS backout commit, updates the RLS to the beta branch (which includes a relative path dep for Cargo and sets the version to 0.121, plus fixes a bug I was having running tests on the beta branch), and backports #44141 (renaming rls component to rls-preview). r? @alexcrichton
2 parents dc6ab22 + 80a77b6 commit 0473748

File tree

10 files changed

+457
-4
lines changed

10 files changed

+457
-4
lines changed

‎src/Cargo.lock

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

‎src/Cargo.toml

+20
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,26 @@ 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",
2040
]
2141

2242
# Curiously, compiletest will segfault if compiled with opt-level=3 on 64-bit

‎src/bootstrap/dist.rs

+49-1
Original file line numberDiff line numberDiff line change
@@ -1126,6 +1126,7 @@ 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 });
11291130
let mingw_installer = builder.ensure(Mingw { host: target });
11301131
let analysis_installer = builder.ensure(Analysis {
11311132
compiler: builder.compiler(stage, self.host),
@@ -1155,7 +1156,7 @@ impl Step for Extended {
11551156
// upgrades rustc was upgraded before rust-std. To avoid rustc clobbering
11561157
// the std files during uninstall. To do this ensure that rustc comes
11571158
// before rust-std in the list below.
1158-
let mut tarballs = vec![rustc_installer, cargo_installer,
1159+
let mut tarballs = vec![rustc_installer, cargo_installer, rls_installer,
11591160
analysis_installer, docs_installer, std_installer];
11601161
if target.contains("pc-windows-gnu") {
11611162
tarballs.push(mingw_installer.unwrap());
@@ -1202,6 +1203,8 @@ impl Step for Extended {
12021203
t!(fs::create_dir_all(pkg.join("cargo")));
12031204
t!(fs::create_dir_all(pkg.join("rust-docs")));
12041205
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")));
12051208

12061209
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rustc"), target)),
12071210
&pkg.join("rustc"));
@@ -1211,11 +1214,17 @@ impl Step for Extended {
12111214
&pkg.join("rust-docs"));
12121215
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rust-std"), target)),
12131216
&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"));
12141221

12151222
install(&etc.join("pkg/postinstall"), &pkg.join("rustc"), 0o755);
12161223
install(&etc.join("pkg/postinstall"), &pkg.join("cargo"), 0o755);
12171224
install(&etc.join("pkg/postinstall"), &pkg.join("rust-docs"), 0o755);
12181225
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);
12191228

12201229
let pkgbuild = |component: &str| {
12211230
let mut cmd = Command::new("pkgbuild");
@@ -1229,6 +1238,8 @@ impl Step for Extended {
12291238
pkgbuild("cargo");
12301239
pkgbuild("rust-docs");
12311240
pkgbuild("rust-std");
1241+
pkgbuild("rls");
1242+
pkgbuild("rust-analysis");
12321243

12331244
// create an 'uninstall' package
12341245
install(&etc.join("pkg/postinstall"), &pkg.join("uninstall"), 0o755);
@@ -1252,6 +1263,8 @@ impl Step for Extended {
12521263
let _ = fs::remove_dir_all(&exe);
12531264
t!(fs::create_dir_all(exe.join("rustc")));
12541265
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")));
12551268
t!(fs::create_dir_all(exe.join("rust-docs")));
12561269
t!(fs::create_dir_all(exe.join("rust-std")));
12571270
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rustc"), target))
@@ -1266,11 +1279,19 @@ impl Step for Extended {
12661279
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rust-std"), target))
12671280
.join(format!("rust-std-{}", target)),
12681281
&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"));
12691288

12701289
t!(fs::remove_file(exe.join("rustc/manifest.in")));
12711290
t!(fs::remove_file(exe.join("cargo/manifest.in")));
12721291
t!(fs::remove_file(exe.join("rust-docs/manifest.in")));
12731292
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")));
12741295

12751296
if target.contains("windows-gnu") {
12761297
t!(fs::create_dir_all(exe.join("rust-mingw")));
@@ -1344,6 +1365,26 @@ impl Step for Extended {
13441365
.arg("-dr").arg("Std")
13451366
.arg("-var").arg("var.StdDir")
13461367
.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")));
13471388
if target.contains("windows-gnu") {
13481389
build.run(Command::new(&heat)
13491390
.current_dir(&exe)
@@ -1367,6 +1408,8 @@ impl Step for Extended {
13671408
.arg("-dDocsDir=rust-docs")
13681409
.arg("-dCargoDir=cargo")
13691410
.arg("-dStdDir=rust-std")
1411+
.arg("-dRlsDir=rls")
1412+
.arg("-dAnalysisDir=rust-analysis")
13701413
.arg("-arch").arg(&arch)
13711414
.arg("-out").arg(&output)
13721415
.arg(&input);
@@ -1384,6 +1427,8 @@ impl Step for Extended {
13841427
candle("DocsGroup.wxs".as_ref());
13851428
candle("CargoGroup.wxs".as_ref());
13861429
candle("StdGroup.wxs".as_ref());
1430+
candle("RlsGroup.wxs".as_ref());
1431+
candle("AnalysisGroup.wxs".as_ref());
13871432

13881433
if target.contains("windows-gnu") {
13891434
candle("GccGroup.wxs".as_ref());
@@ -1406,6 +1451,8 @@ impl Step for Extended {
14061451
.arg("DocsGroup.wixobj")
14071452
.arg("CargoGroup.wixobj")
14081453
.arg("StdGroup.wixobj")
1454+
.arg("RlsGroup.wixobj")
1455+
.arg("AnalysisGroup.wixobj")
14091456
.current_dir(&exe);
14101457

14111458
if target.contains("windows-gnu") {
@@ -1490,6 +1537,7 @@ impl Step for HashSign {
14901537
cmd.arg(today.trim());
14911538
cmd.arg(build.rust_package_vers());
14921539
cmd.arg(build.package_vers(&build.release_num("cargo")));
1540+
cmd.arg(build.package_vers(&build.release_num("rls")));
14931541
cmd.arg(addr);
14941542

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

‎src/bootstrap/mk/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ check-aux:
5656
$(Q)$(BOOTSTRAP) test \
5757
src/tools/cargotest \
5858
src/tools/cargo \
59+
src/tools/rls \
5960
src/test/pretty \
6061
src/test/run-pass/pretty \
6162
src/test/run-fail/pretty \

‎src/bootstrap/tool.rs

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

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

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

358359
fn make_run(run: RunConfig) {

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

+3
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ 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"
4950

5051
[Files]
5152
Source: "rustc/*.*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs; Components: rust
@@ -55,6 +56,8 @@ Source: "rust-mingw/*.*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs;
5556
Source: "rust-docs/*.*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs; Components: docs
5657
Source: "cargo/*.*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs; Components: cargo
5758
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
5861

5962
[Code]
6063
const

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

+10
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,8 @@
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="." />
173175
</Directory>
174176
</Directory>
175177

@@ -273,6 +275,14 @@
273275
<ComponentRef Id="PathEnvPerMachine" />
274276
<ComponentRef Id="PathEnvPerUser" />
275277
</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>
276286

277287
<UIRef Id="RustUI" />
278288
</Product>

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

+11
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<line choice="rust-std"/>
1717
<line choice="cargo"/>
1818
<line choice="rust-docs"/>
19+
<line choice="rls"/>
1920
</line>
2021
<line choice="uninstall" />
2122
</choices-outline>
@@ -61,10 +62,20 @@
6162
>
6263
<pkg-ref id="org.rust-lang.rust-docs"/>
6364
</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>
6473
<pkg-ref id="org.rust-lang.rustc" version="0" onConclusion="none">rustc.pkg</pkg-ref>
6574
<pkg-ref id="org.rust-lang.cargo" version="0" onConclusion="none">cargo.pkg</pkg-ref>
6675
<pkg-ref id="org.rust-lang.rust-docs" version="0" onConclusion="none">rust-docs.pkg</pkg-ref>
6776
<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>
6879
<pkg-ref id="org.rust-lang.uninstall" version="0" onConclusion="none">uninstall.pkg</pkg-ref>
6980
<background file="rust-logo.png" mime-type="image/png"
7081
alignment="bottomleft"/>

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

+20
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ macro_rules! t {
157157
struct Builder {
158158
rust_release: String,
159159
cargo_release: String,
160+
rls_release: String,
160161
input: PathBuf,
161162
output: PathBuf,
162163
gpg_passphrase: String,
@@ -165,6 +166,7 @@ struct Builder {
165166
date: String,
166167
rust_version: String,
167168
cargo_version: String,
169+
rls_version: String,
168170
}
169171

170172
fn main() {
@@ -174,13 +176,15 @@ fn main() {
174176
let date = args.next().unwrap();
175177
let rust_release = args.next().unwrap();
176178
let cargo_release = args.next().unwrap();
179+
let rls_release = args.next().unwrap();
177180
let s3_address = args.next().unwrap();
178181
let mut passphrase = String::new();
179182
t!(io::stdin().read_to_string(&mut passphrase));
180183

181184
Builder {
182185
rust_release,
183186
cargo_release,
187+
rls_release,
184188
input,
185189
output,
186190
gpg_passphrase: passphrase,
@@ -189,13 +193,15 @@ fn main() {
189193
date,
190194
rust_version: String::new(),
191195
cargo_version: String::new(),
196+
rls_version: String::new(),
192197
}.build();
193198
}
194199

195200
impl Builder {
196201
fn build(&mut self) {
197202
self.rust_version = self.version("rust", "x86_64-unknown-linux-gnu");
198203
self.cargo_version = self.version("cargo", "x86_64-unknown-linux-gnu");
204+
self.rls_version = self.version("rls", "x86_64-unknown-linux-gnu");
199205

200206
self.digest_and_sign();
201207
let manifest = self.build_manifest();
@@ -233,6 +239,12 @@ impl Builder {
233239
self.package("rust-std", &mut manifest.pkg, TARGETS);
234240
self.package("rust-docs", &mut manifest.pkg, TARGETS);
235241
self.package("rust-src", &mut manifest.pkg, &["*"]);
242+
let rls_package_name = if self.rust_release == "nightly" {
243+
"rls"
244+
} else {
245+
"rls-preview"
246+
};
247+
self.package(rls_package_name, &mut manifest.pkg, HOSTS);
236248
self.package("rust-analysis", &mut manifest.pkg, TARGETS);
237249

238250
let mut pkg = Package {
@@ -268,6 +280,10 @@ impl Builder {
268280
});
269281
}
270282

283+
extensions.push(Component {
284+
pkg: rls_package_name.to_string(),
285+
target: host.to_string(),
286+
});
271287
extensions.push(Component {
272288
pkg: "rust-analysis".to_string(),
273289
target: host.to_string(),
@@ -342,6 +358,8 @@ impl Builder {
342358
format!("rust-src-{}.tar.gz", self.rust_release)
343359
} else if component == "cargo" {
344360
format!("cargo-{}-{}.tar.gz", self.cargo_release, target)
361+
} else if component == "rls" || component == "rls-preview" {
362+
format!("rls-{}-{}.tar.gz", self.rls_release, target)
345363
} else {
346364
format!("{}-{}-{}.tar.gz", component, self.rust_release, target)
347365
}
@@ -350,6 +368,8 @@ impl Builder {
350368
fn cached_version(&self, component: &str) -> &str {
351369
if component == "cargo" {
352370
&self.cargo_version
371+
} else if component == "rls" || component == "rls-preview" {
372+
&self.rls_version
353373
} else {
354374
&self.rust_version
355375
}

‎src/tools/rls

Submodule rls updated from 25ffb3a to 86ff0b1

0 commit comments

Comments
 (0)