Skip to content

Commit

Permalink
Showing 24 changed files with 31 additions and 40 deletions.
3 changes: 0 additions & 3 deletions src/librustc_serialize/json.rs
Original file line number Diff line number Diff line change
@@ -68,7 +68,6 @@
//!
//! ```rust
//! # #![feature(rustc_private)]
//! extern crate serialize as rustc_serialize; // for the deriving below
//! use rustc_serialize::json;
//!
//! // Automatically generate `Decodable` and `Encodable` trait implementations
@@ -103,7 +102,6 @@
//!
//! ```rust
//! # #![feature(rustc_private)]
//! extern crate serialize as rustc_serialize;
//! use rustc_serialize::json::{self, ToJson, Json};
//!
//! // A custom data structure
@@ -143,7 +141,6 @@
//!
//! ```rust
//! # #![feature(rustc_private)]
//! extern crate serialize as rustc_serialize;
//! use std::collections::BTreeMap;
//! use rustc_serialize::json::{self, Json, ToJson};
//!
2 changes: 0 additions & 2 deletions src/librustc_serialize/tests/json.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#![allow(rustc::internal)]

extern crate serialize as rustc_serialize;

use json::DecoderError::*;
use json::ErrorCode::*;
use json::Json::*;
1 change: 0 additions & 1 deletion src/librustc_serialize/tests/leb128.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
extern crate serialize as rustc_serialize;
use rustc_serialize::leb128::*;

macro_rules! impl_test_unsigned_leb128 {
2 changes: 0 additions & 2 deletions src/librustc_serialize/tests/opaque.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#![allow(rustc::internal)]

extern crate serialize as rustc_serialize;

use rustc_serialize::opaque::{Decoder, Encoder};
use rustc_serialize::{Decodable, Encodable};
use std::fmt::Debug;
2 changes: 1 addition & 1 deletion src/test/run-make-fulldeps/pretty-expanded/input.rs
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

// #13544

extern crate serialize as rustc_serialize;
extern crate rustc_serialize;

#[derive(RustcEncodable)] pub struct A;
#[derive(RustcEncodable)] pub struct B(isize);
4 changes: 2 additions & 2 deletions src/test/run-make-fulldeps/save-analysis/foo.rs
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ use std::char::from_u32;
static uni: &'static str = "Les Miséééééééérables";
static yy: usize = 25;

static bob: Option<graphviz::RenderOption> = None;
static bob: Option<rustc_graphviz::RenderOption> = None;

// buglink test - see issue #1337.

@@ -418,7 +418,7 @@ impl Error + 'static + Send {
<Error + 'static>::is::<T>(self)
}
}
extern crate serialize as rustc_serialize;
extern crate rustc_serialize;
#[derive(Clone, Copy, Hash, RustcEncodable, RustcDecodable,
PartialEq, Eq, PartialOrd, Ord, Debug, Default)]
struct AllDerives(i32);
2 changes: 1 addition & 1 deletion src/test/ui-fulldeps/derive-no-std-not-supported.rs
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
#![feature(rustc_private)]
#![no_std]

extern crate serialize as rustc_serialize;
extern crate rustc_serialize;

#[derive(RustcEncodable)]
struct Bar {
2 changes: 1 addition & 1 deletion src/test/ui-fulldeps/deriving-encodable-decodable-box.rs
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
#![feature(box_syntax)]
#![feature(rustc_private)]

extern crate serialize as rustc_serialize;
extern crate rustc_serialize;

use rustc_serialize::{Encodable, Decodable};
use rustc_serialize::json;
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@

#![feature(rustc_private)]

extern crate serialize as rustc_serialize;
extern crate rustc_serialize;

use std::cell::{Cell, RefCell};
use rustc_serialize::{Encodable, Decodable};
2 changes: 1 addition & 1 deletion src/test/ui-fulldeps/deriving-global.rs
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

#![feature(rustc_private)]

extern crate serialize as rustc_serialize;
extern crate rustc_serialize;

mod submod {
// if any of these are implemented without global calls for any
2 changes: 1 addition & 1 deletion src/test/ui-fulldeps/deriving-hygiene.rs
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

#![allow(non_upper_case_globals)]
#![feature(rustc_private)]
extern crate serialize as rustc_serialize;
extern crate rustc_serialize;

pub const other: u8 = 1;
pub const f: u8 = 1;
2 changes: 1 addition & 1 deletion src/test/ui-fulldeps/dropck-tarena-cycle-checked.stderr
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ LL | }
| -
| |
| `arena` dropped here while still borrowed
| borrow might be used here, when `arena` is dropped and runs the `Drop` code for type `arena::TypedArena`
| borrow might be used here, when `arena` is dropped and runs the `Drop` code for type `rustc_arena::TypedArena`

error: aborting due to previous error

2 changes: 1 addition & 1 deletion src/test/ui-fulldeps/dropck-tarena-unsound-drop.stderr
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ LL | }
| -
| |
| `arena` dropped here while still borrowed
| borrow might be used here, when `arena` is dropped and runs the `Drop` code for type `arena::TypedArena`
| borrow might be used here, when `arena` is dropped and runs the `Drop` code for type `rustc_arena::TypedArena`

error: aborting due to previous error

2 changes: 1 addition & 1 deletion src/test/ui-fulldeps/empty-struct-braces-derive.rs
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@

#![feature(rustc_private)]

extern crate serialize as rustc_serialize;
extern crate rustc_serialize;

#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash,
Default, Debug, RustcEncodable, RustcDecodable)]
4 changes: 2 additions & 2 deletions src/test/ui-fulldeps/extern-mod-syntax.rs
Original file line number Diff line number Diff line change
@@ -3,8 +3,8 @@
#![allow(unused_imports)]
#![feature(rustc_private)]

extern crate serialize;
use serialize::json::Object;
extern crate rustc_serialize;
use rustc_serialize::json::Object;

pub fn main() {
println!("Hello world!");
2 changes: 1 addition & 1 deletion src/test/ui-fulldeps/issue-11881.rs
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@

#![feature(rustc_private)]

extern crate serialize as rustc_serialize;
extern crate rustc_serialize;

use std::io::Cursor;
use std::io::prelude::*;
7 changes: 3 additions & 4 deletions src/test/ui-fulldeps/issue-14021.rs
Original file line number Diff line number Diff line change
@@ -4,11 +4,10 @@
#![allow(unused_imports)]
#![feature(rustc_private)]

extern crate serialize;
extern crate serialize as rustc_serialize;
extern crate rustc_serialize;

use serialize::{Encodable, Decodable};
use serialize::json;
use rustc_serialize::{Encodable, Decodable};
use rustc_serialize::json;

#[derive(RustcEncodable, RustcDecodable, PartialEq, Debug)]
struct UnitLikeStruct;
6 changes: 3 additions & 3 deletions src/test/ui-fulldeps/issue-15924.rs
Original file line number Diff line number Diff line change
@@ -6,11 +6,11 @@

#![feature(rustc_private)]

extern crate serialize;
extern crate rustc_serialize;

use std::fmt;
use serialize::{Encoder, Encodable};
use serialize::json;
use rustc_serialize::{Encoder, Encodable};
use rustc_serialize::json;

struct Foo<T: Encodable> {
v: T,
4 changes: 2 additions & 2 deletions src/test/ui-fulldeps/issue-24972.rs
Original file line number Diff line number Diff line change
@@ -3,9 +3,9 @@
#![allow(dead_code)]
#![feature(rustc_private)]

extern crate serialize;
extern crate rustc_serialize;

use serialize::{Encodable, Decodable};
use rustc_serialize::{Encodable, Decodable};
use std::fmt::Display;

pub trait Entity : Decodable + Encodable + Sized {
4 changes: 2 additions & 2 deletions src/test/ui-fulldeps/issue-2804.rs
Original file line number Diff line number Diff line change
@@ -4,10 +4,10 @@
#![allow(dead_code)]
#![feature(rustc_private)]

extern crate serialize;
extern crate rustc_serialize;

use std::collections::HashMap;
use serialize::json::{self, Json};
use rustc_serialize::json::{self, Json};
use std::option;

enum object {
4 changes: 2 additions & 2 deletions src/test/ui-fulldeps/issue-4016.rs
Original file line number Diff line number Diff line change
@@ -4,9 +4,9 @@

#![feature(rustc_private)]

extern crate serialize;
extern crate rustc_serialize;

use serialize::{json, Decodable};
use rustc_serialize::{json, Decodable};

trait JD : Decodable {}

4 changes: 2 additions & 2 deletions src/test/ui-fulldeps/issue-4036.rs
Original file line number Diff line number Diff line change
@@ -6,9 +6,9 @@

#![feature(rustc_private)]

extern crate serialize;
extern crate rustc_serialize;

use serialize::{json, Decodable};
use rustc_serialize::{json, Decodable};

pub fn main() {
let json = json::from_str("[1]").unwrap();
2 changes: 1 addition & 1 deletion src/test/ui-fulldeps/rustc_encodable_hygiene.rs
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

#[allow(dead_code)]

extern crate serialize as rustc_serialize;
extern crate rustc_serialize;

#[derive(RustcDecodable, RustcEncodable,Debug)]
struct A {
4 changes: 2 additions & 2 deletions src/tools/clippy/clippy_lints/src/lib.rs
Original file line number Diff line number Diff line change
@@ -16,8 +16,6 @@
// FIXME: switch to something more ergonomic here, once available.
// (Currently there is no way to opt into sysroot crates without `extern crate`.)
#[allow(unused_extern_crates)]
extern crate fmt_macros;
#[allow(unused_extern_crates)]
extern crate rustc_ast;
#[allow(unused_extern_crates)]
extern crate rustc_ast_pretty;
@@ -48,6 +46,8 @@ extern crate rustc_mir;
#[allow(unused_extern_crates)]
extern crate rustc_parse;
#[allow(unused_extern_crates)]
extern crate rustc_parse_format;
#[allow(unused_extern_crates)]
extern crate rustc_session;
#[allow(unused_extern_crates)]
extern crate rustc_span;

0 comments on commit e793b46

Please sign in to comment.