Update test

Author: Kobzol

tests/incremental/derive_macro_expansion/auxiliary/derive_nothing.rs

@@ -10,11 +10,5 @@ use proc_macro::TokenStream;
 pub fn derive(_input: TokenStream) -> TokenStream {
     eprintln!("invoked");
 
-    return r#"
-        pub mod nothing_mod {
-            pub fn nothing() {
-                eprintln!("nothing");
-            }
-        }
-    "#.parse().unwrap();
+    TokenStream::new()
 }

tests/incremental/derive_macro_expansion/proc_macro_unchanged.rs

@@ -7,32 +7,21 @@
 // FIXME(pr-time): Properly have the test check this, but how? UI-test that tests for `.stderr`?
 
 //@ aux-build:derive_nothing.rs
-//@ revisions:cfail1 cfail2
-//@ compile-flags: -Z query-dep-graph -Zcache-derive-macros=true
-//@ build-pass
+//@ revisions:rpass1 rpass2
+//@ compile-flags: -Zquery-dep-graph -Zcache-derive-macros
 
 #![feature(rustc_attrs)]
-#![feature(stmt_expr_attributes)]
-#![allow(dead_code)]
-#![crate_type = "rlib"]
-#![rustc_partition_codegened(module = "proc_macro_unchanged-foo", cfg = "cfail1")]
-// #![rustc_partition_codegened(module="proc_macro_unchanged-foo", cfg="cfail2")]
-
-// `foo::nothing_mod` is created by the derive macro and doesn't change
-// BUG: this yields the same result with `-Zcache-derive-macros=false` (i.e., uncached),
-// not sure how to do this correctly.
-#![rustc_partition_reused(module = "proc_macro_unchanged-foo-nothing_mod", cfg = "cfail2")]
 
 #[macro_use]
 extern crate derive_nothing;
 
-pub mod foo {
-    #[derive(Nothing)]
-    pub struct Foo;
+#[cfg(rpass1)]
+#[derive(Nothing)]
+pub struct Foo;
 
-    pub fn use_foo(_f: Foo) {
-        nothing_mod::nothing();
+#[cfg(rpass2)]
+#[derive(Nothing)]
+#[rustc_clean(cfg = "rpass2", loaded_from_disk = "derive_macro_expansion")]
+pub struct Foo;
 
-        eprintln!("foo used");
-    }
-}
+fn main() {}