Rollup merge of #126856 - onur-ozkan:remove-rls, r=clubby789

remove deprecated tool `rls`
This tool has been deprecated for two years and now it only gives warning without doing anything useful.
Zulip discussion: https://rust-lang.zulipchat.com/#narrow/stream/241545-t-release/topic/excluding.20rls.20from.20the.20release
try-job: x86_64-gnu-distcheck

Author: matthiaskrgr

Cargo.lock

@@ -3045,13 +3045,6 @@ dependencies = [
 "serde",
 ]
 
-[[package]]
-name = "rls"
-version = "2.0.0"
-dependencies = [
-"serde_json",
-]
-
 [[package]]
 name = "run_make_support"
 version = "0.2.0"

Cargo.toml

@@ -24,7 +24,6 @@ members = [
 "src/tools/remote-test-server",
 "src/tools/rust-installer",
 "src/tools/rustdoc",
-"src/tools/rls",
 "src/tools/rustfmt",
 "src/tools/miri",
 "src/tools/miri/cargo-miri",

src/bootstrap/src/core/build_steps/check.rs

@@ -454,7 +454,6 @@ tool_check_step!(Rustdoc { path: "src/tools/rustdoc", alt_path: "src/librustdoc"
 tool_check_step!(Clippy{ path:"src/tools/clippy"});
 tool_check_step!(Miri{ path:"src/tools/miri"});
 tool_check_step!(CargoMiri{ path:"src/tools/miri/cargo-miri"});
-tool_check_step!(Rls{ path:"src/tools/rls"});
 tool_check_step!(Rustfmt{ path:"src/tools/rustfmt"});
 tool_check_step!(MiroptTestTools{ path:"src/tools/miropt-test-tools"});
 tool_check_step!(TestFloatParse{ path:"src/etc/test-float-parse"});

src/bootstrap/src/core/build_steps/clippy.rs

@@ -346,7 +346,6 @@ lint_any!(
 OptDist,"src/tools/opt-dist","opt-dist";
 RemoteTestClient,"src/tools/remote-test-client","remote-test-client";
 RemoteTestServer,"src/tools/remote-test-server","remote-test-server";
-Rls,"src/tools/rls","rls";
 RustAnalyzer,"src/tools/rust-analyzer","rust-analyzer";
 Rustdoc,"src/librustdoc","clippy";
 Rustfmt,"src/tools/rustfmt","rustfmt";

src/bootstrap/src/core/build_steps/dist.rs

@@ -1157,48 +1157,6 @@ impl Step for Cargo {
 }
 }
 
-#[derive(Debug,PartialOrd,Ord,Clone,Hash,PartialEq,Eq)]
-pubstructRls{
-pubcompiler:Compiler,
-pubtarget:TargetSelection,
-}
-
-implStepforRls{
-typeOutput = Option<GeneratedTarball>;
-constONLY_HOSTS:bool = true;
-constDEFAULT:bool = true;
-
-fnshould_run(run:ShouldRun<'_>) -> ShouldRun<'_>{
-let default = should_build_extended_tool(run.builder,"rls");
- run.alias("rls").default_condition(default)
-}
-
-fnmake_run(run:RunConfig<'_>){
- run.builder.ensure(Rls{
-compiler: run.builder.compiler_for(
- run.builder.top_stage,
- run.builder.config.build,
- run.target,
-),
-target: run.target,
-});
-}
-
-fnrun(self,builder:&Builder<'_>) -> Option<GeneratedTarball>{
-let compiler = self.compiler;
-let target = self.target;
-
-let rls = builder.ensure(tool::Rls{ compiler, target });
-
-letmut tarball = Tarball::new(builder,"rls",&target.triple);
- tarball.set_overlay(OverlayKind::Rls);
- tarball.is_preview(true);
- tarball.add_file(rls.tool_path,"bin",0o755);
- tarball.add_legal_and_readme_to("share/doc/rls");
-Some(tarball.generate())
-}
-}
-
 #[derive(Debug,PartialOrd,Ord,Clone,Hash,PartialEq,Eq)]
 pubstructRustAnalyzer{
 pubcompiler:Compiler,
@@ -1528,7 +1486,6 @@ impl Step for Extended {
 add_component!("rust-json-docs" => JsonDocs{ host: target });
 add_component!("cargo" => Cargo{ compiler, target });
 add_component!("rustfmt" => Rustfmt{ compiler, target });
-add_component!("rls" => Rls{ compiler, target });
 add_component!("rust-analyzer" => RustAnalyzer{ compiler, target });
 add_component!("llvm-components" => LlvmTools{ target });
 add_component!("clippy" => Clippy{ compiler, target });

src/bootstrap/src/core/build_steps/setup.rs

@@ -85,9 +85,7 @@ impl FromStr for Profile {
 "lib" | "library" => Ok(Profile::Library),
 "compiler" => Ok(Profile::Compiler),
 "maintainer" | "dist" | "user" => Ok(Profile::Dist),
-"tools" | "tool" | "rustdoc" | "clippy" | "miri" | "rustfmt" | "rls" => {
-Ok(Profile::Tools)
-}
+"tools" | "tool" | "rustdoc" | "clippy" | "miri" | "rustfmt" => Ok(Profile::Tools),
 "none" => Ok(Profile::None),
 "llvm" | "codegen" => Err("the \"llvm\" and \"codegen\" profiles have been removed,\
  use \"compiler\" instead which has the same functionality"

src/bootstrap/src/core/build_steps/tool.rs

@@ -228,7 +228,6 @@ pub fn prepare_tool_cargo(
 letmut features = extra_features.to_vec();
 if builder.build.config.cargo_native_static{
 if path.ends_with("cargo")
- || path.ends_with("rls")
  || path.ends_with("clippy")
  || path.ends_with("miri")
  || path.ends_with("rustfmt")
@@ -1231,7 +1230,6 @@ tool_extended!(CargoMiri {
  stable:false,
  add_bins_to_sysroot:["cargo-miri"]
 });
-tool_extended!(Rls{ path:"src/tools/rls", tool_name:"rls", stable:true});
 tool_extended!(Rustfmt{
  path:"src/tools/rustfmt",
  tool_name:"rustfmt",

src/bootstrap/src/core/builder/mod.rs

@@ -895,7 +895,6 @@ impl<'a> Builder<'a> {
  tool::RemoteTestClient,
  tool::RustInstaller,
  tool::Cargo,
- tool::Rls,
  tool::RustAnalyzer,
  tool::RustAnalyzerProcMacroSrv,
  tool::Rustdoc,
@@ -938,7 +937,6 @@ impl<'a> Builder<'a> {
  clippy::OptDist,
  clippy::RemoteTestClient,
  clippy::RemoteTestServer,
- clippy::Rls,
  clippy::RustAnalyzer,
  clippy::Rustdoc,
  clippy::Rustfmt,
@@ -956,7 +954,6 @@ impl<'a> Builder<'a> {
  check::Miri,
  check::CargoMiri,
  check::MiroptTestTools,
- check::Rls,
  check::Rustfmt,
  check::RustAnalyzer,
  check::TestFloatParse,
@@ -1071,7 +1068,6 @@ impl<'a> Builder<'a> {
  dist::Analysis,
  dist::Src,
  dist::Cargo,
- dist::Rls,
  dist::RustAnalyzer,
  dist::Rustfmt,
  dist::Clippy,

src/bootstrap/src/lib.rs

@@ -253,7 +253,7 @@ pub enum Mode {
 /// Build a tool which uses the locally built rustc and the target std,
 /// placing the output in the "stageN-tools" directory. This is used for
 /// anything that needs a fully functional rustc, such as rustdoc, clippy,
-/// cargo, rls, rustfmt, miri, etc.
+/// cargo, rustfmt, miri, etc.
 ToolRustc,
 }
 

src/bootstrap/src/utils/change_tracker.rs

@@ -375,4 +375,9 @@ pub const CONFIG_CHANGE_HISTORY: &[ChangeInfo] = &[
 severity:ChangeSeverity::Info,
 summary:"There is now a new `gcc` config section that can be used to download GCC from CI using `gcc.download-ci-gcc = true`",
 },
+ChangeInfo{
+change_id:126856,
+severity:ChangeSeverity::Warning,
+summary:"Removed `src/tools/rls` tool as it was deprecated long time ago.",
+},
 ];