Auto merge of rust-lang#94228 - Mark-Simulacrum:beta-next, r=Mark-Simulacrum

[beta] Branch 1.60 beta

r? `@Mark-Simulacrum`

Author: bors

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
             })?;

src/ci/channel

@@ -1 +1 @@
-nightly
+beta

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();