From e5c9e1ea1a5b30d4835070d0ae665a802bd72b93 Mon Sep 17 00:00:00 2001
From: Mark Rousskov <mark.simulacrum@gmail.com>
Date: Mon, 21 Feb 2022 14:03:10 -0500
Subject: [PATCH 1/3] Branch 1.60 beta

---
 src/ci/channel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ci/channel b/src/ci/channel
index bf867e0ae5b6c..65b2df87f7df3 100644
--- a/src/ci/channel
+++ b/src/ci/channel
@@ -1 +1 @@
-nightly
+beta

From 95cf5449dd85241929ebfc13c00f6783d460081b Mon Sep 17 00:00:00 2001
From: Mark Rousskov <mark.simulacrum@gmail.com>
Date: Mon, 21 Feb 2022 14:21:02 -0500
Subject: [PATCH 2/3] Fix up unused imports in rustfmt tests

---
 src/tools/rustfmt/src/ignore_path.rs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/tools/rustfmt/src/ignore_path.rs b/src/tools/rustfmt/src/ignore_path.rs
index 7738eee0a7604..8ce3f92c6ec96 100644
--- a/src/tools/rustfmt/src/ignore_path.rs
+++ b/src/tools/rustfmt/src/ignore_path.rs
@@ -32,16 +32,15 @@ impl IgnorePathSet {
 
 #[cfg(test)]
 mod test {
-    use std::path::{Path, PathBuf};
-
-    use crate::config::{Config, FileName};
-    use crate::ignore_path::IgnorePathSet;
-
     use rustfmt_config_proc_macro::nightly_only_test;
 
     #[nightly_only_test]
     #[test]
     fn test_ignore_path_set() {
+        use std::path::{Path, PathBuf};
+
+        use crate::config::{Config, FileName};
+        use crate::ignore_path::IgnorePathSet;
         let config =
             Config::from_toml(r#"ignore = ["foo.rs", "bar_dir/*"]"#, Path::new("")).unwrap();
         let ignore_path_set = IgnorePathSet::from_ignore_list(&config.ignore()).unwrap();

From 07493dd547ae220c321a2c9dcc7cf8602c8257b2 Mon Sep 17 00:00:00 2001
From: Mark Rousskov <mark.simulacrum@gmail.com>
Date: Mon, 21 Feb 2022 21:34:55 -0500
Subject: [PATCH 3/3] Temporarily avoid errors on RLS failure in parallel

---
 src/bootstrap/dist.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 029049d543435..f5ae8103cb057 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -1023,6 +1023,12 @@ impl Step for Rls {
         let rls = builder
             .ensure(tool::Rls { compiler, target, extra_features: Vec::new() })
             .or_else(|| {
+                if builder.config.rustc_parallel {
+                    // FIXME: Disable RLS on parallel builds, cannot build due
+                    // to upstream trouble. See
+                    // https://github.com/racer-rust/racer/pull/1177.
+                    return None;
+                }
                 missing_tool("RLS", builder.build.config.missing_tools);
                 None
             })?;