Auto merge of #43114 - brson:beta-next, r=alexcrichton

[beta] backports - #43068 - #43043 - #42745 The pick of 143206d in cfa3b58 was not clean and needed a fair bit of surgery. It should probably be looked at closely. Still testing locally.

Author: bors

.travis.yml

@@ -1,4 +1,4 @@
-language: generic
+language: shell
 sudo: required
 dist: trusty
 services:

src/Cargo.lock

@@ -15,7 +15,6 @@ members = [
  "tools/remote-test-server",
  "tools/rust-installer",
  "tools/cargo",
- "tools/rls",
 ]
 
 # Curiously, compiletest will segfault if compiled with opt-level=3 on 64-bit
@@ -34,6 +33,3 @@ debug-assertions = false
 [profile.test]
 debug = false
 debug-assertions = false
-
-[replace]
-"https://github.com/rust-lang/cargo#0.20.0" = { path = "tools/cargo" }

src/Cargo.toml

@@ -28,7 +28,7 @@ pub const CFG_RELEASE_NUM: &'static str = "1.19.0";
 // An optional number to put after the label, e.g. '.2' -> '-beta.2'
 // Be sure to make this starts with a dot to conform to semver pre-release
 // versions (section 9)
-pub const CFG_PRERELEASE_VERSION: &'static str = ".3";
+pub const CFG_PRERELEASE_VERSION: &'static str = ".4";
 
 pub struct GitInfo {
  inner: Option<Info>,

src/bootstrap/channel.rs

@@ -834,9 +834,6 @@ pub fn extended(build: &Build, stage: u32, target: &str) {
  let cargo_installer = dist.join(format!("{}-{}.tar.gz",
  pkgname(build, "cargo"),
  target));
- let rls_installer = dist.join(format!("{}-{}.tar.gz",
- pkgname(build, "rls"),
- target));
  let analysis_installer = dist.join(format!("{}-{}.tar.gz",
  pkgname(build, "rust-analysis"),
  target));
@@ -867,7 +864,7 @@ pub fn extended(build: &Build, stage: u32, target: &str) {
  // upgrades rustc was upgraded before rust-std. To avoid rustc clobbering
  // the std files during uninstall. To do this ensure that rustc comes
  // before rust-std in the list below.
- let mut tarballs = vec![rustc_installer, cargo_installer, rls_installer,
+ let mut tarballs = vec![rustc_installer, cargo_installer,
  analysis_installer, docs_installer, std_installer];
  if target.contains("pc-windows-gnu") {
  tarballs.push(mingw_installer);
@@ -1184,7 +1181,6 @@ pub fn hash_and_sign(build: &Build) {
  cmd.arg(today.trim());
  cmd.arg(build.rust_package_vers());
  cmd.arg(build.package_vers(&build.release_num("cargo")));
- cmd.arg(build.package_vers(&build.release_num("rls")));
  cmd.arg(addr);
 
  t!(fs::create_dir_all(distdir(build)));

src/bootstrap/dist.rs

@@ -596,7 +596,6 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules {
  .run(move |s| compile::tool(build, s.stage, s.target, "cargo"));
  rules.build("tool-rls", "src/tools/rls")
  .host(true)
- .default(build.config.extended)
  .dep(|s| s.name("librustc-tool"))
  .dep(|s| s.stage(0).host(s.target).name("openssl"))
  .dep(move |s| {
@@ -783,7 +782,6 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules {
  .dep(|d| d.name("dist-mingw"))
  .dep(|d| d.name("dist-docs"))
  .dep(|d| d.name("dist-cargo"))
- .dep(|d| d.name("dist-rls"))
  .dep(|d| d.name("dist-analysis"))
  .dep(move |s| tool_rust_installer(build, s))
  .run(move |s| dist::extended(build, s.stage, s.target));
@@ -812,7 +810,6 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules {
  .dep(|s| s.name("dist-cargo"))
  .run(move |s| install::Installer::new(build).install_cargo(s.stage, s.target));
  rules.install("install-rls", "rls")
- .default(build.config.extended)
  .host(true)
  .only_host_build(true)
  .dep(|s| s.name("dist-rls"))

src/bootstrap/step.rs

@@ -109,7 +109,6 @@
  - [collection_placement](library-features/collection-placement.md)
  - [collections_range](library-features/collections-range.md)
  - [collections](library-features/collections.md)
- - [command_envs](library-features/command-envs.md)
  - [compiler_builtins_lib](library-features/compiler-builtins-lib.md)
  - [compiler_fences](library-features/compiler-fences.md)
  - [concat_idents_macro](library-features/concat-idents-macro.md)
@@ -169,7 +168,6 @@
  - [once_poison](library-features/once-poison.md)
  - [oom](library-features/oom.md)
  - [option_entry](library-features/option-entry.md)
- - [osstring_shrink_to_fit](library-features/osstring-shrink-to-fit.md)
  - [panic_abort](library-features/panic-abort.md)
  - [panic_unwind](library-features/panic-unwind.md)
  - [pattern](library-features/pattern.md)
@@ -181,7 +179,6 @@
  - [rand](library-features/rand.md)
  - [range_contains](library-features/range-contains.md)
  - [raw](library-features/raw.md)
- - [reverse_cmp_key](library-features/reverse-cmp-key.md)
  - [rt](library-features/rt.md)
  - [rustc_private](library-features/rustc-private.md)
  - [sanitizer_runtime_lib](library-features/sanitizer-runtime-lib.md)
@@ -203,7 +200,6 @@
  - [str_box_extras](library-features/str-box-extras.md)
  - [str_mut_extras](library-features/str-mut-extras.md)
  - [test](library-features/test.md)
- - [thread_id](library-features/thread-id.md)
  - [thread_local_internals](library-features/thread-local-internals.md)
  - [thread_local_state](library-features/thread-local-state.md)
  - [toowned_clone_into](library-features/toowned-clone-into.md)