Rollup merge of #75485 - RalfJung:pin, r=nagisa

[rust.git] / src / test / ui-fulldeps / deriving-global.rs

diff --git a/src/test/ui-fulldeps/deriving-global.rs b/src/test/ui-fulldeps/deriving-global.rs
index 5ba34a7af6bf53337e7578f1ab9cf6ac7539c446..921767af981ad6e10062da418868ba91ad99a3c9 100644 (file)
--- a/src/test/ui-fulldeps/deriving-global.rs
+++ b/src/test/ui-fulldeps/deriving-global.rs
@@ -2,33 +2,29 @@
 
 #![feature(rustc_private)]
 
+extern crate rustc_macros;
 extern crate rustc_serialize;
 
 mod submod {
+    use rustc_macros::{Decodable, Encodable};
+
     // if any of these are implemented without global calls for any
     // function calls, then being in a submodule will (correctly)
     // cause errors about unrecognised module `std` (or `extra`)
-    #[derive(PartialEq, PartialOrd, Eq, Ord,
-               Hash,
-               Clone,
-               Debug,
-               RustcEncodable, RustcDecodable)]
-    enum A { A1(usize), A2(isize) }
+    #[derive(PartialEq, PartialOrd, Eq, Ord, Hash, Clone, Debug, Encodable, Decodable)]
+    enum A {
+        A1(usize),
+        A2(isize),
+    }
 
-    #[derive(PartialEq, PartialOrd, Eq, Ord,
-               Hash,
-               Clone,
-               Debug,
-               RustcEncodable, RustcDecodable)]
-    struct B { x: usize, y: isize }
+    #[derive(PartialEq, PartialOrd, Eq, Ord, Hash, Clone, Debug, Encodable, Decodable)]
+    struct B {
+        x: usize,
+        y: isize,
+    }
 
-    #[derive(PartialEq, PartialOrd, Eq, Ord,
-               Hash,
-               Clone,
-               Debug,
-               RustcEncodable, RustcDecodable)]
+    #[derive(PartialEq, PartialOrd, Eq, Ord, Hash, Clone, Debug, Encodable, Decodable)]
     struct C(usize, isize);
-
 }
 
 pub fn main() {}