rust-lang · bors · Apr 18, 2023 · Apr 18, 2023
diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs
@@ -150,7 +150,7 @@ fn main() {
     // allow the `rustc_private` feature to link to other unstable crates
     // also in the sysroot. We also do this for host crates, since those
     // may be proc macros, in which case we might ship them.
-    if env::var_os("RUSTC_FORCE_UNSTABLE").is_some() && (stage != "0" || target.is_some()) {
+    if env::var_os("RUSTC_FORCE_UNSTABLE").is_some() {
         cmd.arg("-Z").arg("force-unstable-if-unmarked");
     }
 

diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
@@ -1008,9 +1008,24 @@ impl<'a> Builder<'a> {
                 // Avoid deleting the rustlib/ directory we just copied
                 // (in `impl Step for Sysroot`).
                 if !builder.download_rustc() {
+                    builder.verbose(&format!(
+                        "Removing sysroot {} to avoid caching bugs",
+                        sysroot.display()
+                    ));
                     let _ = fs::remove_dir_all(&sysroot);
                     t!(fs::create_dir_all(&sysroot));
                 }
+
+                if self.compiler.stage == 0 {
+                    // The stage 0 compiler for the build triple is always pre-built.
+                    // Ensure that `libLLVM.so` ends up in the target libdir, so that ui-fulldeps tests can use it when run.
+                    dist::maybe_install_llvm_target(
+                        builder,
+                        self.compiler.host,
+                        &builder.sysroot(self.compiler),
+                    );
+                }
+
                 INTERNER.intern_path(sysroot)
             }
         }

diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
@@ -1260,6 +1260,7 @@ impl Step for Sysroot {
         };
         let sysroot = sysroot_dir(compiler.stage);
 
+        builder.verbose(&format!("Removing sysroot {} to avoid caching bugs", sysroot.display()));
         let _ = fs::remove_dir_all(&sysroot);
         t!(fs::create_dir_all(&sysroot));
 

diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
@@ -1448,7 +1448,7 @@ note: if you're sure you want to do this, please open an issue as to why. In the
             crate::detail_exit(1);
         }
 
-        let compiler = self.compiler;
+        let mut compiler = self.compiler;
         let target = self.target;
         let mode = self.mode;
         let suite = self.suite;
@@ -1461,15 +1461,28 @@ note: if you're sure you want to do this, please open an issue as to why. In the
             return;
         }
 
-        if suite == "debuginfo" {
-            builder
-                .ensure(dist::DebuggerScripts { sysroot: builder.sysroot(compiler), host: target });
-        }
+        // Support stage 1 ui-fulldeps. This is somewhat complicated: ui-fulldeps tests for the most
+        // part test the *API* of the compiler, not how it compiles a given file. As a result, we
+        // can run them against the stage 1 sources as long as we build them with the stage 0
+        // bootstrap compiler.
+        // NOTE: Only stage 1 is special cased because we need the rustc_private artifacts to match the
+        // running compiler in stage 2 when plugins run.
+        let stage_id = if suite == "ui-fulldeps" && compiler.stage == 1 {
+            compiler = builder.compiler(compiler.stage - 1, target);
+            format!("stage{}-{}", compiler.stage + 1, target)
+        } else {
+            format!("stage{}-{}", compiler.stage, target)
+        };
 
         if suite.ends_with("fulldeps") {
             builder.ensure(compile::Rustc::new(compiler, target));
         }
 
+        if suite == "debuginfo" {
+            builder
+                .ensure(dist::DebuggerScripts { sysroot: builder.sysroot(compiler), host: target });
+        }
+
         builder.ensure(compile::Std::new(compiler, target));
         // ensure that `libproc_macro` is available on the host.
         builder.ensure(compile::Std::new(compiler, compiler.host));
@@ -1528,7 +1541,7 @@ note: if you're sure you want to do this, please open an issue as to why. In the
         cmd.arg("--src-base").arg(builder.src.join("tests").join(suite));
         cmd.arg("--build-base").arg(testdir(builder, compiler.host).join(suite));
         cmd.arg("--sysroot-base").arg(builder.sysroot(compiler));
-        cmd.arg("--stage-id").arg(format!("stage{}-{}", compiler.stage, target));
+        cmd.arg("--stage-id").arg(stage_id);
         cmd.arg("--suite").arg(suite);
         cmd.arg("--mode").arg(mode);
         cmd.arg("--target").arg(target.rustc_target_arg());

diff --git a/src/tools/compiletest/src/common.rs b/src/tools/compiletest/src/common.rs
@@ -419,7 +419,9 @@ pub struct TargetCfgs {
 
 impl TargetCfgs {
     fn new(config: &Config) -> TargetCfgs {
-        let targets: HashMap<String, TargetCfg> = if config.stage_id.starts_with("stage0-") {
+        let targets: HashMap<String, TargetCfg> = if config.stage_id.starts_with("stage0-")
+            || (config.suite == "ui-fulldeps" && config.stage_id.starts_with("stage1-"))
+        {
             // #[cfg(bootstrap)]
             // Needed only for one cycle, remove during the bootstrap bump.
             Self::collect_all_slow(config)

diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
@@ -1900,6 +1900,9 @@ impl<'test> TestCx<'test> {
         // Use a single thread for efficiency and a deterministic error message order
         rustc.arg("-Zthreads=1");
 
+        // In stage 0, make sure we use `stage0-sysroot` instead of the bootstrap sysroot.
+        rustc.arg("--sysroot").arg(&self.config.sysroot_base);
+
         // Optionally prevent default --target if specified in test compile-flags.
         let custom_target = self.props.compile_flags.iter().any(|x| x.starts_with("--target"));
 

diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
@@ -9,7 +9,7 @@ use std::path::{Path, PathBuf};
 
 // FIXME: The following limits should be reduced eventually.
 const ENTRY_LIMIT: usize = 885;
-const ROOT_ENTRY_LIMIT: usize = 891;
+const ROOT_ENTRY_LIMIT: usize = 894;
 const ISSUES_ENTRY_LIMIT: usize = 1977;
 
 fn check_entries(tests_path: &Path, bad: &mut bool) {

diff --git a/tests/ui-fulldeps/compiler-calls.rs b/tests/ui-fulldeps/compiler-calls.rs
@@ -2,7 +2,6 @@
 // Test that the Callbacks interface to the compiler works.
 
 // ignore-cross-compile
-// ignore-stage1
 // ignore-remote
 
 #![feature(rustc_private)]

diff --git a/tests/ui-fulldeps/hash-stable-is-unstable.rs b/tests/ui-fulldeps/hash-stable-is-unstable.rs
@@ -1,4 +1,3 @@
-// ignore-stage1
 // compile-flags: -Zdeduplicate-diagnostics=yes
 extern crate rustc_data_structures;
 //~^ use of unstable library feature 'rustc_private'

diff --git a/tests/ui-fulldeps/hash-stable-is-unstable.stderr b/tests/ui-fulldeps/hash-stable-is-unstable.stderr
@@ -1,5 +1,5 @@
 error[E0658]: use of unstable library feature 'rustc_private': this crate is being loaded from the sysroot, an unstable location; did you mean to load this crate from crates.io via `Cargo.toml` instead?
-  --> $DIR/hash-stable-is-unstable.rs:3:1
+  --> $DIR/hash-stable-is-unstable.rs:2:1
    |
 LL | extern crate rustc_data_structures;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -8,7 +8,7 @@ LL | extern crate rustc_data_structures;
    = help: add `#![feature(rustc_private)]` to the crate attributes to enable
 
 error[E0658]: use of unstable library feature 'rustc_private': this crate is being loaded from the sysroot, an unstable location; did you mean to load this crate from crates.io via `Cargo.toml` instead?
-  --> $DIR/hash-stable-is-unstable.rs:5:1
+  --> $DIR/hash-stable-is-unstable.rs:4:1
    |
 LL | extern crate rustc_macros;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -17,7 +17,7 @@ LL | extern crate rustc_macros;
    = help: add `#![feature(rustc_private)]` to the crate attributes to enable
 
 error[E0658]: use of unstable library feature 'rustc_private': this crate is being loaded from the sysroot, an unstable location; did you mean to load this crate from crates.io via `Cargo.toml` instead?
-  --> $DIR/hash-stable-is-unstable.rs:7:1
+  --> $DIR/hash-stable-is-unstable.rs:6:1
    |
 LL | extern crate rustc_query_system;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -26,7 +26,7 @@ LL | extern crate rustc_query_system;
    = help: add `#![feature(rustc_private)]` to the crate attributes to enable
 
 error[E0658]: use of unstable library feature 'rustc_private': this crate is being loaded from the sysroot, an unstable location; did you mean to load this crate from crates.io via `Cargo.toml` instead?
-  --> $DIR/hash-stable-is-unstable.rs:10:5
+  --> $DIR/hash-stable-is-unstable.rs:9:5
    |
 LL | use rustc_macros::HashStable;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^
@@ -35,7 +35,7 @@ LL | use rustc_macros::HashStable;
    = help: add `#![feature(rustc_private)]` to the crate attributes to enable
 
 error[E0658]: use of unstable library feature 'rustc_private': this crate is being loaded from the sysroot, an unstable location; did you mean to load this crate from crates.io via `Cargo.toml` instead?
-  --> $DIR/hash-stable-is-unstable.rs:13:10
+  --> $DIR/hash-stable-is-unstable.rs:12:10
    |
 LL | #[derive(HashStable)]
    |          ^^^^^^^^^^

diff --git a/tests/ui-fulldeps/pathless-extern-unstable.rs b/tests/ui-fulldeps/pathless-extern-unstable.rs
@@ -1,4 +1,3 @@
-// ignore-stage1
 // edition:2018
 // compile-flags:--extern rustc_middle
 

diff --git a/tests/ui-fulldeps/pathless-extern-unstable.stderr b/tests/ui-fulldeps/pathless-extern-unstable.stderr
@@ -1,5 +1,5 @@
 error[E0658]: use of unstable library feature 'rustc_private': this crate is being loaded from the sysroot, an unstable location; did you mean to load this crate from crates.io via `Cargo.toml` instead?
-  --> $DIR/pathless-extern-unstable.rs:7:9
+  --> $DIR/pathless-extern-unstable.rs:6:9
    |
 LL | pub use rustc_middle;
    |         ^^^^^^^^^^^^

diff --git a/tests/ui-fulldeps/auxiliary/empty-plugin.rs → ...fulldeps/plugin/auxiliary/empty-plugin.rs b/tests/ui-fulldeps/auxiliary/empty-plugin.rs → ...fulldeps/plugin/auxiliary/empty-plugin.rs
diff --git a/...-fulldeps/auxiliary/issue-40001-plugin.rs → ...ps/plugin/auxiliary/issue-40001-plugin.rs b/...-fulldeps/auxiliary/issue-40001-plugin.rs → ...ps/plugin/auxiliary/issue-40001-plugin.rs
diff --git a/...s/ui-fulldeps/auxiliary/lint-for-crate.rs → ...lldeps/plugin/auxiliary/lint-for-crate.rs b/...s/ui-fulldeps/auxiliary/lint-for-crate.rs → ...lldeps/plugin/auxiliary/lint-for-crate.rs
diff --git a/...ldeps/auxiliary/lint-group-plugin-test.rs → ...lugin/auxiliary/lint-group-plugin-test.rs b/...ldeps/auxiliary/lint-group-plugin-test.rs → ...lugin/auxiliary/lint-group-plugin-test.rs
diff --git a/...ui-fulldeps/auxiliary/lint-plugin-test.rs → ...deps/plugin/auxiliary/lint-plugin-test.rs b/...ui-fulldeps/auxiliary/lint-plugin-test.rs → ...deps/plugin/auxiliary/lint-plugin-test.rs
diff --git a/...s/ui-fulldeps/auxiliary/lint-tool-test.rs → ...lldeps/plugin/auxiliary/lint-tool-test.rs b/...s/ui-fulldeps/auxiliary/lint-tool-test.rs → ...lldeps/plugin/auxiliary/lint-tool-test.rs
diff --git a/...eps/auxiliary/lto-syntax-extension-lib.rs → ...gin/auxiliary/lto-syntax-extension-lib.rs b/...eps/auxiliary/lto-syntax-extension-lib.rs → ...gin/auxiliary/lto-syntax-extension-lib.rs
diff --git a/.../auxiliary/lto-syntax-extension-plugin.rs → .../auxiliary/lto-syntax-extension-plugin.rs b/.../auxiliary/lto-syntax-extension-plugin.rs → .../auxiliary/lto-syntax-extension-plugin.rs
diff --git a/...-fulldeps/auxiliary/multiple-plugins-1.rs → ...ps/plugin/auxiliary/multiple-plugins-1.rs b/...-fulldeps/auxiliary/multiple-plugins-1.rs → ...ps/plugin/auxiliary/multiple-plugins-1.rs
diff --git a/...-fulldeps/auxiliary/multiple-plugins-2.rs → ...ps/plugin/auxiliary/multiple-plugins-2.rs b/...-fulldeps/auxiliary/multiple-plugins-2.rs → ...ps/plugin/auxiliary/multiple-plugins-2.rs
diff --git a/...deps/auxiliary/outlive-expansion-phase.rs → ...ugin/auxiliary/outlive-expansion-phase.rs b/...deps/auxiliary/outlive-expansion-phase.rs → ...ugin/auxiliary/outlive-expansion-phase.rs
diff --git a/.../ui-fulldeps/auxiliary/rlib-crate-test.rs → ...ldeps/plugin/auxiliary/rlib-crate-test.rs b/.../ui-fulldeps/auxiliary/rlib-crate-test.rs → ...ldeps/plugin/auxiliary/rlib-crate-test.rs
diff --git a/tests/ui-fulldeps/feature-gate-plugin.rs → ...ui-fulldeps/plugin/feature-gate-plugin.rs b/tests/ui-fulldeps/feature-gate-plugin.rs → ...ui-fulldeps/plugin/feature-gate-plugin.rs
diff --git a/tests/ui-fulldeps/feature-gate-plugin.stderr → ...ulldeps/plugin/feature-gate-plugin.stderr b/tests/ui-fulldeps/feature-gate-plugin.stderr → ...ulldeps/plugin/feature-gate-plugin.stderr
diff --git a/tests/ui-fulldeps/gated-plugin.rs → tests/ui-fulldeps/plugin/gated-plugin.rs b/tests/ui-fulldeps/gated-plugin.rs → tests/ui-fulldeps/plugin/gated-plugin.rs
diff --git a/tests/ui-fulldeps/gated-plugin.stderr → tests/ui-fulldeps/plugin/gated-plugin.stderr b/tests/ui-fulldeps/gated-plugin.stderr → tests/ui-fulldeps/plugin/gated-plugin.stderr
diff --git a/tests/ui-fulldeps/issue-15778-fail.rs → tests/ui-fulldeps/plugin/issue-15778-fail.rs b/tests/ui-fulldeps/issue-15778-fail.rs → tests/ui-fulldeps/plugin/issue-15778-fail.rs
diff --git a/tests/ui-fulldeps/issue-15778-fail.stderr → ...i-fulldeps/plugin/issue-15778-fail.stderr b/tests/ui-fulldeps/issue-15778-fail.stderr → ...i-fulldeps/plugin/issue-15778-fail.stderr
diff --git a/tests/ui-fulldeps/issue-40001.rs → tests/ui-fulldeps/plugin/issue-40001.rs b/tests/ui-fulldeps/issue-40001.rs → tests/ui-fulldeps/plugin/issue-40001.rs
diff --git a/tests/ui-fulldeps/issue-40001.stderr → tests/ui-fulldeps/plugin/issue-40001.stderr b/tests/ui-fulldeps/issue-40001.stderr → tests/ui-fulldeps/plugin/issue-40001.stderr
diff --git a/...ulldeps/lint-group-plugin-deny-cmdline.rs → .../plugin/lint-group-plugin-deny-cmdline.rs b/...ulldeps/lint-group-plugin-deny-cmdline.rs → .../plugin/lint-group-plugin-deny-cmdline.rs
diff --git a/...eps/lint-group-plugin-deny-cmdline.stderr → ...gin/lint-group-plugin-deny-cmdline.stderr b/...eps/lint-group-plugin-deny-cmdline.stderr → ...gin/lint-group-plugin-deny-cmdline.stderr
diff --git a/tests/ui-fulldeps/lint-group-plugin.rs → ...s/ui-fulldeps/plugin/lint-group-plugin.rs b/tests/ui-fulldeps/lint-group-plugin.rs → ...s/ui-fulldeps/plugin/lint-group-plugin.rs
diff --git a/tests/ui-fulldeps/lint-group-plugin.stderr → ...-fulldeps/plugin/lint-group-plugin.stderr b/tests/ui-fulldeps/lint-group-plugin.stderr → ...-fulldeps/plugin/lint-group-plugin.stderr
diff --git a/.../ui-fulldeps/lint-plugin-cmdline-allow.rs → ...ldeps/plugin/lint-plugin-cmdline-allow.rs b/.../ui-fulldeps/lint-plugin-cmdline-allow.rs → ...ldeps/plugin/lint-plugin-cmdline-allow.rs
diff --git a/...fulldeps/lint-plugin-cmdline-allow.stderr → ...s/plugin/lint-plugin-cmdline-allow.stderr b/...fulldeps/lint-plugin-cmdline-allow.stderr → ...s/plugin/lint-plugin-cmdline-allow.stderr
diff --git a/...s/ui-fulldeps/lint-plugin-cmdline-load.rs → ...lldeps/plugin/lint-plugin-cmdline-load.rs b/...s/ui-fulldeps/lint-plugin-cmdline-load.rs → ...lldeps/plugin/lint-plugin-cmdline-load.rs
diff --git a/...-fulldeps/lint-plugin-cmdline-load.stderr → ...ps/plugin/lint-plugin-cmdline-load.stderr b/...-fulldeps/lint-plugin-cmdline-load.stderr → ...ps/plugin/lint-plugin-cmdline-load.stderr
diff --git a/tests/ui-fulldeps/lint-plugin-deny-attr.rs → ...-fulldeps/plugin/lint-plugin-deny-attr.rs b/tests/ui-fulldeps/lint-plugin-deny-attr.rs → ...-fulldeps/plugin/lint-plugin-deny-attr.rs
diff --git a/.../ui-fulldeps/lint-plugin-deny-attr.stderr → ...ldeps/plugin/lint-plugin-deny-attr.stderr b/.../ui-fulldeps/lint-plugin-deny-attr.stderr → ...ldeps/plugin/lint-plugin-deny-attr.stderr
diff --git a/...s/ui-fulldeps/lint-plugin-deny-cmdline.rs → ...lldeps/plugin/lint-plugin-deny-cmdline.rs b/...s/ui-fulldeps/lint-plugin-deny-cmdline.rs → ...lldeps/plugin/lint-plugin-deny-cmdline.rs
diff --git a/...-fulldeps/lint-plugin-deny-cmdline.stderr → ...ps/plugin/lint-plugin-deny-cmdline.stderr b/...-fulldeps/lint-plugin-deny-cmdline.stderr → ...ps/plugin/lint-plugin-deny-cmdline.stderr
diff --git a/...s/ui-fulldeps/lint-plugin-forbid-attrs.rs → ...lldeps/plugin/lint-plugin-forbid-attrs.rs b/...s/ui-fulldeps/lint-plugin-forbid-attrs.rs → ...lldeps/plugin/lint-plugin-forbid-attrs.rs
diff --git a/...-fulldeps/lint-plugin-forbid-attrs.stderr → ...ps/plugin/lint-plugin-forbid-attrs.stderr b/...-fulldeps/lint-plugin-forbid-attrs.stderr → ...ps/plugin/lint-plugin-forbid-attrs.stderr
diff --git a/...ui-fulldeps/lint-plugin-forbid-cmdline.rs → ...deps/plugin/lint-plugin-forbid-cmdline.rs b/...ui-fulldeps/lint-plugin-forbid-cmdline.rs → ...deps/plugin/lint-plugin-forbid-cmdline.rs
diff --git a/...ulldeps/lint-plugin-forbid-cmdline.stderr → .../plugin/lint-plugin-forbid-cmdline.stderr b/...ulldeps/lint-plugin-forbid-cmdline.stderr → .../plugin/lint-plugin-forbid-cmdline.stderr
diff --git a/tests/ui-fulldeps/lint-plugin.rs → tests/ui-fulldeps/plugin/lint-plugin.rs b/tests/ui-fulldeps/lint-plugin.rs → tests/ui-fulldeps/plugin/lint-plugin.rs
diff --git a/tests/ui-fulldeps/lint-plugin.stderr → tests/ui-fulldeps/plugin/lint-plugin.stderr b/tests/ui-fulldeps/lint-plugin.stderr → tests/ui-fulldeps/plugin/lint-plugin.stderr
diff --git a/tests/ui-fulldeps/lint-tool-cmdline-allow.rs → ...ulldeps/plugin/lint-tool-cmdline-allow.rs b/tests/ui-fulldeps/lint-tool-cmdline-allow.rs → ...ulldeps/plugin/lint-tool-cmdline-allow.rs
diff --git a/...i-fulldeps/lint-tool-cmdline-allow.stderr → ...eps/plugin/lint-tool-cmdline-allow.stderr b/...i-fulldeps/lint-tool-cmdline-allow.stderr → ...eps/plugin/lint-tool-cmdline-allow.stderr
diff --git a/tests/ui-fulldeps/lint-tool-test.rs → tests/ui-fulldeps/plugin/lint-tool-test.rs b/tests/ui-fulldeps/lint-tool-test.rs → tests/ui-fulldeps/plugin/lint-tool-test.rs
diff --git a/tests/ui-fulldeps/lint-tool-test.stderr → .../ui-fulldeps/plugin/lint-tool-test.stderr b/tests/ui-fulldeps/lint-tool-test.stderr → .../ui-fulldeps/plugin/lint-tool-test.stderr
diff --git a/tests/ui-fulldeps/lto-syntax-extension.rs → ...i-fulldeps/plugin/lto-syntax-extension.rs b/tests/ui-fulldeps/lto-syntax-extension.rs → ...i-fulldeps/plugin/lto-syntax-extension.rs
diff --git a/...s/ui-fulldeps/lto-syntax-extension.stderr → ...lldeps/plugin/lto-syntax-extension.stderr b/...s/ui-fulldeps/lto-syntax-extension.stderr → ...lldeps/plugin/lto-syntax-extension.stderr
diff --git a/tests/ui-fulldeps/macro-crate-rlib.rs → tests/ui-fulldeps/plugin/macro-crate-rlib.rs b/tests/ui-fulldeps/macro-crate-rlib.rs → tests/ui-fulldeps/plugin/macro-crate-rlib.rs
@@ -1,4 +1,5 @@
 // aux-build:rlib-crate-test.rs
+// ignore-stage1
 // ignore-cross-compile gives a different error message
 
 #![feature(plugin)]

diff --git a/tests/ui-fulldeps/macro-crate-rlib.stderr → ...i-fulldeps/plugin/macro-crate-rlib.stderr b/tests/ui-fulldeps/macro-crate-rlib.stderr → ...i-fulldeps/plugin/macro-crate-rlib.stderr
@@ -1,5 +1,5 @@
 error[E0457]: plugin `rlib_crate_test` only found in rlib format, but must be available in dylib format
-  --> $DIR/macro-crate-rlib.rs:5:11
+  --> $DIR/macro-crate-rlib.rs:6:11
    |
 LL | #![plugin(rlib_crate_test)]
    |           ^^^^^^^^^^^^^^^

diff --git a/tests/ui-fulldeps/multiple-plugins.rs → tests/ui-fulldeps/plugin/multiple-plugins.rs b/tests/ui-fulldeps/multiple-plugins.rs → tests/ui-fulldeps/plugin/multiple-plugins.rs
diff --git a/tests/ui-fulldeps/multiple-plugins.stderr → ...i-fulldeps/plugin/multiple-plugins.stderr b/tests/ui-fulldeps/multiple-plugins.stderr → ...i-fulldeps/plugin/multiple-plugins.stderr
diff --git a/tests/ui-fulldeps/outlive-expansion-phase.rs → ...ulldeps/plugin/outlive-expansion-phase.rs b/tests/ui-fulldeps/outlive-expansion-phase.rs → ...ulldeps/plugin/outlive-expansion-phase.rs
diff --git a/...i-fulldeps/outlive-expansion-phase.stderr → ...eps/plugin/outlive-expansion-phase.stderr b/...i-fulldeps/outlive-expansion-phase.stderr → ...eps/plugin/outlive-expansion-phase.stderr
diff --git a/tests/ui-fulldeps/plugin-args.rs → tests/ui-fulldeps/plugin/plugin-args.rs b/tests/ui-fulldeps/plugin-args.rs → tests/ui-fulldeps/plugin/plugin-args.rs
diff --git a/tests/ui-fulldeps/plugin-args.stderr → tests/ui-fulldeps/plugin/plugin-args.stderr b/tests/ui-fulldeps/plugin-args.stderr → tests/ui-fulldeps/plugin/plugin-args.stderr
diff --git a/tests/ui-fulldeps/plugin-as-extern-crate.rs → ...fulldeps/plugin/plugin-as-extern-crate.rs b/tests/ui-fulldeps/plugin-as-extern-crate.rs → ...fulldeps/plugin/plugin-as-extern-crate.rs
diff --git a/tests/ui-fulldeps/session-diagnostic/diagnostic-derive.rs b/tests/ui-fulldeps/session-diagnostic/diagnostic-derive.rs
@@ -6,6 +6,7 @@
 // The proc_macro2 crate handles spans differently when on beta/stable release rather than nightly,
 // changing the output of this test. Since Diagnostic is strictly internal to the compiler
 // the test is just ignored on stable and beta:
+// ignore-stage1
 // ignore-beta
 // ignore-stable