Update fulldeps tests and clippy

24 files changed, 31 insertions, 40 deletions

diff --git a/src/librustc_serialize/json.rs b/src/librustc_serialize/json.rs
index 2d4e953ac51..820ebdc9baa 100644
--- a/src/librustc_serialize/json.rs
+++ b/src/librustc_serialize/json.rs
@@ -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};
 //!
diff --git a/src/librustc_serialize/tests/json.rs b/src/librustc_serialize/tests/json.rs
index 688bddc2baf..59c481edbca 100644
--- a/src/librustc_serialize/tests/json.rs
+++ b/src/librustc_serialize/tests/json.rs
@@ -1,7 +1,5 @@
 #![allow(rustc::internal)]
 
-extern crate serialize as rustc_serialize;
-
 use json::DecoderError::*;
 use json::ErrorCode::*;
 use json::Json::*;
diff --git a/src/librustc_serialize/tests/leb128.rs b/src/librustc_serialize/tests/leb128.rs
index bf5afb409f8..b0f7e785b78 100644
--- a/src/librustc_serialize/tests/leb128.rs
+++ b/src/librustc_serialize/tests/leb128.rs
@@ -1,4 +1,3 @@
-extern crate serialize as rustc_serialize;
 use rustc_serialize::leb128::*;
 
 macro_rules! impl_test_unsigned_leb128 {
diff --git a/src/librustc_serialize/tests/opaque.rs b/src/librustc_serialize/tests/opaque.rs
index a6ec1580aca..c8273917007 100644
--- a/src/librustc_serialize/tests/opaque.rs
+++ b/src/librustc_serialize/tests/opaque.rs
@@ -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;
diff --git a/src/test/run-make-fulldeps/pretty-expanded/input.rs b/src/test/run-make-fulldeps/pretty-expanded/input.rs
index 3cbabc5b460..af3d75b3bf2 100644
--- a/src/test/run-make-fulldeps/pretty-expanded/input.rs
+++ b/src/test/run-make-fulldeps/pretty-expanded/input.rs
@@ -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);
diff --git a/src/test/run-make-fulldeps/save-analysis/foo.rs b/src/test/run-make-fulldeps/save-analysis/foo.rs
index eb16ca93bf2..789ab686e3f 100644
--- a/src/test/run-make-fulldeps/save-analysis/foo.rs
+++ b/src/test/run-make-fulldeps/save-analysis/foo.rs
@@ -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);
diff --git a/src/test/ui-fulldeps/derive-no-std-not-supported.rs b/src/test/ui-fulldeps/derive-no-std-not-supported.rs
index d09b1922a7b..1299d82d9c4 100644
--- a/src/test/ui-fulldeps/derive-no-std-not-supported.rs
+++ b/src/test/ui-fulldeps/derive-no-std-not-supported.rs
@@ -4,7 +4,7 @@
 #![feature(rustc_private)]
 #![no_std]
 
-extern crate serialize as rustc_serialize;
+extern crate rustc_serialize;
 
 #[derive(RustcEncodable)]
 struct Bar {
diff --git a/src/test/ui-fulldeps/deriving-encodable-decodable-box.rs b/src/test/ui-fulldeps/deriving-encodable-decodable-box.rs
index 29c1b8fb0da..2b349ae9556 100644
--- a/src/test/ui-fulldeps/deriving-encodable-decodable-box.rs
+++ b/src/test/ui-fulldeps/deriving-encodable-decodable-box.rs
@@ -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;
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 fe608890bbd..c2aecbdc167 100644
--- a/src/test/ui-fulldeps/deriving-encodable-decodable-cell-refcell.rs
+++ b/src/test/ui-fulldeps/deriving-encodable-decodable-cell-refcell.rs
@@ -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};
diff --git a/src/test/ui-fulldeps/deriving-global.rs b/src/test/ui-fulldeps/deriving-global.rs
index d7cc98fed25..5ba34a7af6b 100644
--- a/src/test/ui-fulldeps/deriving-global.rs
+++ b/src/test/ui-fulldeps/deriving-global.rs
@@ -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
diff --git a/src/test/ui-fulldeps/deriving-hygiene.rs b/src/test/ui-fulldeps/deriving-hygiene.rs
index b1bdfaceb88..85ef217e767 100644
--- a/src/test/ui-fulldeps/deriving-hygiene.rs
+++ b/src/test/ui-fulldeps/deriving-hygiene.rs
@@ -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;
diff --git a/src/test/ui-fulldeps/dropck-tarena-cycle-checked.stderr b/src/test/ui-fulldeps/dropck-tarena-cycle-checked.stderr
index 7009c0bba69..98c1a22bd1d 100644
--- a/src/test/ui-fulldeps/dropck-tarena-cycle-checked.stderr
+++ b/src/test/ui-fulldeps/dropck-tarena-cycle-checked.stderr
@@ -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
 
diff --git a/src/test/ui-fulldeps/dropck-tarena-unsound-drop.stderr b/src/test/ui-fulldeps/dropck-tarena-unsound-drop.stderr
index 319848b9896..22c7487e8f5 100644
--- a/src/test/ui-fulldeps/dropck-tarena-unsound-drop.stderr
+++ b/src/test/ui-fulldeps/dropck-tarena-unsound-drop.stderr
@@ -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
 
diff --git a/src/test/ui-fulldeps/empty-struct-braces-derive.rs b/src/test/ui-fulldeps/empty-struct-braces-derive.rs
index 68b407423aa..fc85765eea4 100644
--- a/src/test/ui-fulldeps/empty-struct-braces-derive.rs
+++ b/src/test/ui-fulldeps/empty-struct-braces-derive.rs
@@ -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)]
diff --git a/src/test/ui-fulldeps/extern-mod-syntax.rs b/src/test/ui-fulldeps/extern-mod-syntax.rs
index 258ab0dbe95..a90ab7ac438 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 serialize;
-use serialize::json::Object;
+extern crate rustc_serialize;
+use rustc_serialize::json::Object;
 
 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 bd046a6cdee..7b0abba4d16 100644
--- a/src/test/ui-fulldeps/issue-11881.rs
+++ b/src/test/ui-fulldeps/issue-11881.rs
@@ -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::*;
diff --git a/src/test/ui-fulldeps/issue-14021.rs b/src/test/ui-fulldeps/issue-14021.rs
index 49fa4492fa1..1898b12c703 100644
--- a/src/test/ui-fulldeps/issue-14021.rs
+++ b/src/test/ui-fulldeps/issue-14021.rs
@@ -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;
diff --git a/src/test/ui-fulldeps/issue-15924.rs b/src/test/ui-fulldeps/issue-15924.rs
index ec33de12ebb..e3d4b0eb446 100644
--- a/src/test/ui-fulldeps/issue-15924.rs
+++ b/src/test/ui-fulldeps/issue-15924.rs
@@ -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,
diff --git a/src/test/ui-fulldeps/issue-24972.rs b/src/test/ui-fulldeps/issue-24972.rs
index 0d354aac137..51e134fbf88 100644
--- a/src/test/ui-fulldeps/issue-24972.rs
+++ b/src/test/ui-fulldeps/issue-24972.rs
@@ -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 {
diff --git a/src/test/ui-fulldeps/issue-2804.rs b/src/test/ui-fulldeps/issue-2804.rs
index a5345bbcd14..3d5922d155f 100644
--- a/src/test/ui-fulldeps/issue-2804.rs
+++ b/src/test/ui-fulldeps/issue-2804.rs
@@ -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 {
diff --git a/src/test/ui-fulldeps/issue-4016.rs b/src/test/ui-fulldeps/issue-4016.rs
index fb84acbe645..96157c2f426 100644
--- a/src/test/ui-fulldeps/issue-4016.rs
+++ b/src/test/ui-fulldeps/issue-4016.rs
@@ -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 {}
 
diff --git a/src/test/ui-fulldeps/issue-4036.rs b/src/test/ui-fulldeps/issue-4036.rs
index 9c9d3914268..05a7a30140a 100644
--- a/src/test/ui-fulldeps/issue-4036.rs
+++ b/src/test/ui-fulldeps/issue-4036.rs
@@ -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();
diff --git a/src/test/ui-fulldeps/rustc_encodable_hygiene.rs b/src/test/ui-fulldeps/rustc_encodable_hygiene.rs
index 42a6153465c..b49135cb60b 100644
--- a/src/test/ui-fulldeps/rustc_encodable_hygiene.rs
+++ b/src/test/ui-fulldeps/rustc_encodable_hygiene.rs
@@ -4,7 +4,7 @@
 
 #[allow(dead_code)]
 
-extern crate serialize as rustc_serialize;
+extern crate rustc_serialize;
 
 #[derive(RustcDecodable, RustcEncodable,Debug)]
 struct A {
diff --git a/src/tools/clippy/clippy_lints/src/lib.rs b/src/tools/clippy/clippy_lints/src/lib.rs
index 902f3d56c1e..b7d928d249f 100644
--- a/src/tools/clippy/clippy_lints/src/lib.rs
+++ b/src/tools/clippy/clippy_lints/src/lib.rs
@@ -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;