From 5cb4f4ed7d3959cced8e04f2802595059f2f680d Mon Sep 17 00:00:00 2001 From: Matthew Jasper Date: Sat, 4 Jul 2020 16:20:24 +0100 Subject: [PATCH] Fix ui fulldeps tests --- .../derive-no-std-not-supported.rs | 22 ------------- .../deriving-encodable-decodable-box.rs | 7 ++-- ...riving-encodable-decodable-cell-refcell.rs | 19 +++++------ src/test/ui-fulldeps/deriving-global.rs | 32 ++++++++----------- src/test/ui-fulldeps/deriving-hygiene.rs | 8 +++-- .../ui-fulldeps/empty-struct-braces-derive.rs | 12 +++---- src/test/ui-fulldeps/issue-11881.rs | 21 ++++++------ src/test/ui-fulldeps/issue-14021.rs | 6 ++-- src/test/ui-fulldeps/issue-15924.rs | 9 +++--- src/test/ui-fulldeps/issue-24972.rs | 18 ++++++++--- src/test/ui-fulldeps/issue-4016.rs | 3 +- .../ui-fulldeps/rustc_encodable_hygiene.rs | 6 ++-- 12 files changed, 75 insertions(+), 88 deletions(-) delete mode 100644 src/test/ui-fulldeps/derive-no-std-not-supported.rs diff --git a/src/test/ui-fulldeps/derive-no-std-not-supported.rs b/src/test/ui-fulldeps/derive-no-std-not-supported.rs deleted file mode 100644 index 1299d82d9c4..00000000000 --- a/src/test/ui-fulldeps/derive-no-std-not-supported.rs +++ /dev/null @@ -1,22 +0,0 @@ -// run-pass - -#![allow(dead_code)] -#![feature(rustc_private)] -#![no_std] - -extern crate rustc_serialize; - -#[derive(RustcEncodable)] -struct Bar { - x: u32, -} - -#[derive(RustcDecodable)] -struct Baz { - x: u32, -} - -fn main() { - Bar { x: 0 }; - Baz { x: 0 }; -} diff --git a/src/test/ui-fulldeps/deriving-encodable-decodable-box.rs b/src/test/ui-fulldeps/deriving-encodable-decodable-box.rs index 2b349ae9556..119fa3d6fa8 100644 --- a/src/test/ui-fulldeps/deriving-encodable-decodable-box.rs +++ b/src/test/ui-fulldeps/deriving-encodable-decodable-box.rs @@ -1,16 +1,17 @@ // run-pass #![allow(unused_imports)] - #![feature(box_syntax)] #![feature(rustc_private)] +extern crate rustc_macros; extern crate rustc_serialize; -use rustc_serialize::{Encodable, Decodable}; +use rustc_macros::{Decodable, Encodable}; use rustc_serialize::json; +use rustc_serialize::{Decodable, Encodable}; -#[derive(RustcEncodable, RustcDecodable)] +#[derive(Encodable, Decodable)] struct A { foo: Box<[bool]>, } diff --git a/src/test/ui-fulldeps/deriving-encodable-decodable-cell-refcell.rs b/src/test/ui-fulldeps/deriving-encodable-decodable-cell-refcell.rs index c2aecbdc167..9dedf990f25 100644 --- a/src/test/ui-fulldeps/deriving-encodable-decodable-cell-refcell.rs +++ b/src/test/ui-fulldeps/deriving-encodable-decodable-cell-refcell.rs @@ -3,32 +3,29 @@ #![allow(unused_imports)] // This briefly tests the capability of `Cell` and `RefCell` to implement the // `Encodable` and `Decodable` traits via `#[derive(Encodable, Decodable)]` - - #![feature(rustc_private)] +extern crate rustc_macros; extern crate rustc_serialize; -use std::cell::{Cell, RefCell}; -use rustc_serialize::{Encodable, Decodable}; +use rustc_macros::{Decodable, Encodable}; use rustc_serialize::json; +use rustc_serialize::{Decodable, Encodable}; +use std::cell::{Cell, RefCell}; -#[derive(RustcEncodable, RustcDecodable)] +#[derive(Encodable, Decodable)] struct A { - baz: isize + baz: isize, } -#[derive(RustcEncodable, RustcDecodable)] +#[derive(Encodable, Decodable)] struct B { foo: Cell, bar: RefCell, } fn main() { - let obj = B { - foo: Cell::new(true), - bar: RefCell::new( A { baz: 2 } ) - }; + let obj = B { foo: Cell::new(true), bar: RefCell::new(A { baz: 2 }) }; let s = json::encode(&obj).unwrap(); let obj2: B = json::decode(&s).unwrap(); assert_eq!(obj.foo.get(), obj2.foo.get()); diff --git a/src/test/ui-fulldeps/deriving-global.rs b/src/test/ui-fulldeps/deriving-global.rs index 5ba34a7af6b..921767af981 100644 --- 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() {} diff --git a/src/test/ui-fulldeps/deriving-hygiene.rs b/src/test/ui-fulldeps/deriving-hygiene.rs index 85ef217e767..8486b8b6e48 100644 --- a/src/test/ui-fulldeps/deriving-hygiene.rs +++ b/src/test/ui-fulldeps/deriving-hygiene.rs @@ -2,8 +2,11 @@ #![allow(non_upper_case_globals)] #![feature(rustc_private)] +extern crate rustc_macros; extern crate rustc_serialize; +use rustc_macros::{Decodable, Encodable}; + pub const other: u8 = 1; pub const f: u8 = 1; pub const d: u8 = 1; @@ -11,8 +14,7 @@ pub const s: u8 = 1; pub const state: u8 = 1; pub const cmp: u8 = 1; -#[derive(Ord,Eq,PartialOrd,PartialEq,Debug,RustcDecodable,RustcEncodable,Hash)] +#[derive(Ord, Eq, PartialOrd, PartialEq, Debug, Decodable, Encodable, Hash)] struct Foo {} -fn main() { -} +fn main() {} diff --git a/src/test/ui-fulldeps/empty-struct-braces-derive.rs b/src/test/ui-fulldeps/empty-struct-braces-derive.rs index fc85765eea4..6e5eb54629c 100644 --- a/src/test/ui-fulldeps/empty-struct-braces-derive.rs +++ b/src/test/ui-fulldeps/empty-struct-braces-derive.rs @@ -3,18 +3,18 @@ #![feature(rustc_private)] +extern crate rustc_macros; extern crate rustc_serialize; -#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, - Default, Debug, RustcEncodable, RustcDecodable)] +use rustc_macros::{Decodable, Encodable}; + +#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Default, Debug, Encodable, Decodable)] struct S {} -#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, - Default, Debug, RustcEncodable, RustcDecodable)] +#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Default, Debug, Encodable, Decodable)] struct Z(); -#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, - Debug, RustcEncodable, RustcDecodable)] +#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Encodable, Decodable)] enum E { V {}, U, diff --git a/src/test/ui-fulldeps/issue-11881.rs b/src/test/ui-fulldeps/issue-11881.rs index 7b0abba4d16..6d64aeeda7e 100644 --- a/src/test/ui-fulldeps/issue-11881.rs +++ b/src/test/ui-fulldeps/issue-11881.rs @@ -3,26 +3,27 @@ #![allow(unused_must_use)] #![allow(dead_code)] #![allow(unused_imports)] - #![feature(rustc_private)] +extern crate rustc_macros; extern crate rustc_serialize; -use std::io::Cursor; -use std::io::prelude::*; use std::fmt; +use std::io::prelude::*; +use std::io::Cursor; use std::slice; -use rustc_serialize::{Encodable, Encoder}; +use rustc_macros::Encodable; use rustc_serialize::json; use rustc_serialize::opaque; +use rustc_serialize::{Encodable, Encoder}; -#[derive(RustcEncodable)] +#[derive(Encodable)] struct Foo { baz: bool, } -#[derive(RustcEncodable)] +#[derive(Encodable)] struct Bar { froboz: usize, } @@ -33,19 +34,19 @@ enum WireProtocol { // ... } -fn encode_json(val: &T, wr: &mut Cursor>) { +fn encode_json Encodable>>(val: &T, wr: &mut Cursor>) { write!(wr, "{}", json::as_json(val)); } -fn encode_opaque(val: &T, wr: Vec) { +fn encode_opaque>(val: &T, wr: Vec) { let mut encoder = opaque::Encoder::new(wr); val.encode(&mut encoder); } pub fn main() { - let target = Foo{baz: false,}; + let target = Foo { baz: false }; let proto = WireProtocol::JSON; match proto { WireProtocol::JSON => encode_json(&target, &mut Cursor::new(Vec::new())), - WireProtocol::Opaque => encode_opaque(&target, Vec::new()) + WireProtocol::Opaque => encode_opaque(&target, Vec::new()), } } diff --git a/src/test/ui-fulldeps/issue-14021.rs b/src/test/ui-fulldeps/issue-14021.rs index 1898b12c703..be88a593962 100644 --- a/src/test/ui-fulldeps/issue-14021.rs +++ b/src/test/ui-fulldeps/issue-14021.rs @@ -4,12 +4,14 @@ #![allow(unused_imports)] #![feature(rustc_private)] +extern crate rustc_macros; extern crate rustc_serialize; -use rustc_serialize::{Encodable, Decodable}; +use rustc_macros::{Decodable, Encodable}; use rustc_serialize::json; +use rustc_serialize::{Decodable, Encodable}; -#[derive(RustcEncodable, RustcDecodable, PartialEq, Debug)] +#[derive(Encodable, Decodable, PartialEq, Debug)] struct UnitLikeStruct; pub fn main() { diff --git a/src/test/ui-fulldeps/issue-15924.rs b/src/test/ui-fulldeps/issue-15924.rs index e3d4b0eb446..5adc2c482f5 100644 --- a/src/test/ui-fulldeps/issue-15924.rs +++ b/src/test/ui-fulldeps/issue-15924.rs @@ -3,20 +3,19 @@ #![allow(unused_imports)] #![allow(unused_must_use)] // pretty-expanded FIXME #23616 - #![feature(rustc_private)] extern crate rustc_serialize; -use std::fmt; -use rustc_serialize::{Encoder, Encodable}; use rustc_serialize::json; +use rustc_serialize::{Encodable, Encoder}; +use std::fmt; -struct Foo { +struct Foo Encodable>> { v: T, } -impl Drop for Foo { +impl Encodable>> Drop for Foo { fn drop(&mut self) { json::encode(&self.v); } diff --git a/src/test/ui-fulldeps/issue-24972.rs b/src/test/ui-fulldeps/issue-24972.rs index 51e134fbf88..044a0c5000e 100644 --- a/src/test/ui-fulldeps/issue-24972.rs +++ b/src/test/ui-fulldeps/issue-24972.rs @@ -5,11 +5,18 @@ extern crate rustc_serialize; -use rustc_serialize::{Encodable, Decodable}; +use rustc_serialize::{json, Decodable, Encodable}; use std::fmt::Display; -pub trait Entity : Decodable + Encodable + Sized { - type Key: Clone + Decodable + Encodable + ToString + Display + Eq + Ord + Sized; +pub trait Entity: Decodable + for<'a> Encodable> + Sized { + type Key: Clone + + Decodable + + for<'a> Encodable> + + ToString + + Display + + Eq + + Ord + + Sized; fn id(&self) -> Self::Key; @@ -20,7 +27,10 @@ pub struct DbRef { pub id: E::Key, } -impl DbRef where E: Entity { +impl DbRef +where + E: Entity, +{ fn get(self) -> Option { E::find_by_id(self.id) } diff --git a/src/test/ui-fulldeps/issue-4016.rs b/src/test/ui-fulldeps/issue-4016.rs index 96157c2f426..4fd192497a0 100644 --- a/src/test/ui-fulldeps/issue-4016.rs +++ b/src/test/ui-fulldeps/issue-4016.rs @@ -1,14 +1,13 @@ // run-pass #![allow(dead_code)] - #![feature(rustc_private)] extern crate rustc_serialize; use rustc_serialize::{json, Decodable}; -trait JD : Decodable {} +trait JD: Decodable {} fn exec() { let doc = json::from_str("").unwrap(); diff --git a/src/test/ui-fulldeps/rustc_encodable_hygiene.rs b/src/test/ui-fulldeps/rustc_encodable_hygiene.rs index b49135cb60b..452110a65e4 100644 --- a/src/test/ui-fulldeps/rustc_encodable_hygiene.rs +++ b/src/test/ui-fulldeps/rustc_encodable_hygiene.rs @@ -2,11 +2,13 @@ #![feature(rustc_private)] +extern crate rustc_macros; #[allow(dead_code)] - extern crate rustc_serialize; -#[derive(RustcDecodable, RustcEncodable,Debug)] +use rustc_macros::{Decodable, Encodable}; + +#[derive(Decodable, Encodable, Debug)] struct A { a: String, }