From 606848a61ea6d303b2aa3d4cf01881a11971c0c1 Mon Sep 17 00:00:00 2001 From: bjorn3 Date: Thu, 5 May 2022 18:34:13 +0200 Subject: [PATCH] Fix all tests --- src/test/ui-fulldeps/extern-mod-syntax.rs | 4 +- src/test/ui-fulldeps/issue-11881.rs | 66 ++++++++++++++++++----- src/test/ui-fulldeps/issue-15924.rs | 43 ++++++++++++--- src/test/ui-fulldeps/issue-2804.rs | 33 ++++++++---- 4 files changed, 111 insertions(+), 35 deletions(-) diff --git a/src/test/ui-fulldeps/extern-mod-syntax.rs b/src/test/ui-fulldeps/extern-mod-syntax.rs index a90ab7ac438..230194c5377 100644 --- a/src/test/ui-fulldeps/extern-mod-syntax.rs +++ b/src/test/ui-fulldeps/extern-mod-syntax.rs @@ -3,8 +3,8 @@ #![allow(unused_imports)] #![feature(rustc_private)] -extern crate rustc_serialize; -use rustc_serialize::json::Object; +extern crate libc; +use libc::c_void; pub fn main() { println!("Hello world!"); diff --git a/src/test/ui-fulldeps/issue-11881.rs b/src/test/ui-fulldeps/issue-11881.rs index 6d64aeeda7e..9641470a68b 100644 --- a/src/test/ui-fulldeps/issue-11881.rs +++ b/src/test/ui-fulldeps/issue-11881.rs @@ -3,42 +3,80 @@ #![allow(unused_must_use)] #![allow(dead_code)] #![allow(unused_imports)] -#![feature(rustc_private)] - -extern crate rustc_macros; -extern crate rustc_serialize; use std::fmt; use std::io::prelude::*; use std::io::Cursor; use std::slice; +use std::marker::PhantomData; + +trait Encoder { + type Error; +} + +trait Encodable { + fn encode(&self, s: &mut S) -> Result<(), S::Error>; +} + +struct JsonEncoder<'a>(PhantomData<&'a mut ()>); + +impl Encoder for JsonEncoder<'_> { + type Error = (); +} + +struct AsJson<'a, T> { + inner: &'a T, +} + +impl<'a, T: for<'r> Encodable>> fmt::Display for AsJson<'a, T> { + /// Encodes a json value into a string + fn fmt(&self, _f: &mut fmt::Formatter<'_>) -> fmt::Result { + Ok(()) + } +} + +fn as_json(t: &T) -> AsJson<'_, T> { + AsJson { inner: t } +} + +struct OpaqueEncoder(Vec); + +impl Encoder for OpaqueEncoder { + type Error = (); +} -use rustc_macros::Encodable; -use rustc_serialize::json; -use rustc_serialize::opaque; -use rustc_serialize::{Encodable, Encoder}; -#[derive(Encodable)] struct Foo { baz: bool, } -#[derive(Encodable)] +impl Encodable for Foo { + fn encode(&self, _s: &mut S) -> Result<(), S::Error> { + Ok(()) + } +} + struct Bar { froboz: usize, } +impl Encodable for Bar { + fn encode(&self, _s: &mut S) -> Result<(), S::Error> { + Ok(()) + } +} + enum WireProtocol { JSON, Opaque, // ... } -fn encode_json Encodable>>(val: &T, wr: &mut Cursor>) { - write!(wr, "{}", json::as_json(val)); +fn encode_json Encodable>>(val: &T, wr: &mut Cursor>) { + write!(wr, "{}", as_json(val)); } -fn encode_opaque>(val: &T, wr: Vec) { - let mut encoder = opaque::Encoder::new(wr); +fn encode_opaque>(val: &T, wr: Vec) { + let mut encoder = OpaqueEncoder(wr); val.encode(&mut encoder); } diff --git a/src/test/ui-fulldeps/issue-15924.rs b/src/test/ui-fulldeps/issue-15924.rs index 5adc2c482f5..d8b3914d0d4 100644 --- a/src/test/ui-fulldeps/issue-15924.rs +++ b/src/test/ui-fulldeps/issue-15924.rs @@ -3,21 +3,48 @@ #![allow(unused_imports)] #![allow(unused_must_use)] // pretty-expanded FIXME #23616 -#![feature(rustc_private)] -extern crate rustc_serialize; - -use rustc_serialize::json; -use rustc_serialize::{Encodable, Encoder}; use std::fmt; +use std::marker::PhantomData; -struct Foo Encodable>> { +trait Encoder { + type Error; +} + +trait Encodable { + fn encode(&self, s: &mut S) -> Result<(), S::Error>; +} + +impl Encodable for i32 { + fn encode(&self, _s: &mut S) -> Result<(), S::Error> { + Ok(()) + } +} + +struct JsonEncoder<'a>(PhantomData<&'a mut ()>); + +impl Encoder for JsonEncoder<'_> { + type Error = (); +} + +fn encode_json Encodable>>( + object: &T, +) -> Result { + let s = String::new(); + { + let mut encoder = JsonEncoder(PhantomData); + object.encode(&mut encoder)?; + } + Ok(s) +} + +struct Foo Encodable>> { v: T, } -impl Encodable>> Drop for Foo { +impl Encodable>> Drop for Foo { fn drop(&mut self) { - json::encode(&self.v); + encode_json(&self.v); } } diff --git a/src/test/ui-fulldeps/issue-2804.rs b/src/test/ui-fulldeps/issue-2804.rs index 3d5922d155f..571028c5e40 100644 --- a/src/test/ui-fulldeps/issue-2804.rs +++ b/src/test/ui-fulldeps/issue-2804.rs @@ -2,27 +2,38 @@ #![allow(non_camel_case_types)] #![allow(dead_code)] -#![feature(rustc_private)] -extern crate rustc_serialize; - -use std::collections::HashMap; -use rustc_serialize::json::{self, Json}; +use std::collections::{BTreeMap, HashMap}; use std::option; +#[derive(Clone, Debug)] +enum Json { + I64(i64), + U64(u64), + F64(f64), + String(String), + Boolean(bool), + Array(Array), + Object(Object), + Null, +} + +type Array = Vec; +type Object = BTreeMap; + enum object { bool_value(bool), int_value(i64), } -fn lookup(table: json::Object, key: String, default: String) -> String +fn lookup(table: Object, key: String, default: String) -> String { match table.get(&key) { option::Option::Some(&Json::String(ref s)) => { s.to_string() } option::Option::Some(value) => { - println!("{} was expected to be a string but is a {}", key, value); + println!("{} was expected to be a string but is a {:?}", key, value); default } option::Option::None => { @@ -31,7 +42,7 @@ fn lookup(table: json::Object, key: String, default: String) -> String } } -fn add_interface(_store: isize, managed_ip: String, data: json::Json) -> (String, object) +fn add_interface(_store: isize, managed_ip: String, data: Json) -> (String, object) { match &data { &Json::Object(ref interface) => { @@ -43,13 +54,13 @@ fn add_interface(_store: isize, managed_ip: String, data: json::Json) -> (String (label, object::bool_value(false)) } _ => { - println!("Expected dict for {} interfaces, found {}", managed_ip, data); + println!("Expected dict for {} interfaces, found {:?}", managed_ip, data); ("gnos:missing-interface".to_string(), object::bool_value(true)) } } } -fn add_interfaces(store: isize, managed_ip: String, device: HashMap) +fn add_interfaces(store: isize, managed_ip: String, device: HashMap) -> Vec<(String, object)> { match device["interfaces"] { Json::Array(ref interfaces) => @@ -60,7 +71,7 @@ fn add_interfaces(store: isize, managed_ip: String, device: HashMap { - println!("Expected list for {} interfaces, found {}", managed_ip, + println!("Expected list for {} interfaces, found {:?}", managed_ip, device["interfaces"]); Vec::new() }