Skip to content

Commit e793b46

Browse files
committed
Update fulldeps tests and clippy
1 parent 283e5b4 commit e793b46

24 files changed

+31
-40
lines changed

src/librustc_serialize/json.rs

-3
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@
6868
//!
6969
//! ```rust
7070
//! # #![feature(rustc_private)]
71-
//! extern crate serialize as rustc_serialize; // for the deriving below
7271
//! use rustc_serialize::json;
7372
//!
7473
//! // Automatically generate `Decodable` and `Encodable` trait implementations
@@ -103,7 +102,6 @@
103102
//!
104103
//! ```rust
105104
//! # #![feature(rustc_private)]
106-
//! extern crate serialize as rustc_serialize;
107105
//! use rustc_serialize::json::{self, ToJson, Json};
108106
//!
109107
//! // A custom data structure
@@ -143,7 +141,6 @@
143141
//!
144142
//! ```rust
145143
//! # #![feature(rustc_private)]
146-
//! extern crate serialize as rustc_serialize;
147144
//! use std::collections::BTreeMap;
148145
//! use rustc_serialize::json::{self, Json, ToJson};
149146
//!

src/librustc_serialize/tests/json.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#![allow(rustc::internal)]
22

3-
extern crate serialize as rustc_serialize;
4-
53
use json::DecoderError::*;
64
use json::ErrorCode::*;
75
use json::Json::*;

src/librustc_serialize/tests/leb128.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
extern crate serialize as rustc_serialize;
21
use rustc_serialize::leb128::*;
32

43
macro_rules! impl_test_unsigned_leb128 {

src/librustc_serialize/tests/opaque.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#![allow(rustc::internal)]
22

3-
extern crate serialize as rustc_serialize;
4-
53
use rustc_serialize::opaque::{Decoder, Encoder};
64
use rustc_serialize::{Decodable, Encodable};
75
use std::fmt::Debug;

src/test/run-make-fulldeps/pretty-expanded/input.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// #13544
44

5-
extern crate serialize as rustc_serialize;
5+
extern crate rustc_serialize;
66

77
#[derive(RustcEncodable)] pub struct A;
88
#[derive(RustcEncodable)] pub struct B(isize);

src/test/run-make-fulldeps/save-analysis/foo.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use std::char::from_u32;
2727
static uni: &'static str = "Les Miséééééééérables";
2828
static yy: usize = 25;
2929

30-
static bob: Option<graphviz::RenderOption> = None;
30+
static bob: Option<rustc_graphviz::RenderOption> = None;
3131

3232
// buglink test - see issue #1337.
3333

@@ -418,7 +418,7 @@ impl Error + 'static + Send {
418418
<Error + 'static>::is::<T>(self)
419419
}
420420
}
421-
extern crate serialize as rustc_serialize;
421+
extern crate rustc_serialize;
422422
#[derive(Clone, Copy, Hash, RustcEncodable, RustcDecodable,
423423
PartialEq, Eq, PartialOrd, Ord, Debug, Default)]
424424
struct AllDerives(i32);

src/test/ui-fulldeps/derive-no-std-not-supported.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#![feature(rustc_private)]
55
#![no_std]
66

7-
extern crate serialize as rustc_serialize;
7+
extern crate rustc_serialize;
88

99
#[derive(RustcEncodable)]
1010
struct Bar {

src/test/ui-fulldeps/deriving-encodable-decodable-box.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#![feature(box_syntax)]
66
#![feature(rustc_private)]
77

8-
extern crate serialize as rustc_serialize;
8+
extern crate rustc_serialize;
99

1010
use rustc_serialize::{Encodable, Decodable};
1111
use rustc_serialize::json;

src/test/ui-fulldeps/deriving-encodable-decodable-cell-refcell.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#![feature(rustc_private)]
99

10-
extern crate serialize as rustc_serialize;
10+
extern crate rustc_serialize;
1111

1212
use std::cell::{Cell, RefCell};
1313
use rustc_serialize::{Encodable, Decodable};

src/test/ui-fulldeps/deriving-global.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#![feature(rustc_private)]
44

5-
extern crate serialize as rustc_serialize;
5+
extern crate rustc_serialize;
66

77
mod submod {
88
// if any of these are implemented without global calls for any

src/test/ui-fulldeps/deriving-hygiene.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#![allow(non_upper_case_globals)]
44
#![feature(rustc_private)]
5-
extern crate serialize as rustc_serialize;
5+
extern crate rustc_serialize;
66

77
pub const other: u8 = 1;
88
pub const f: u8 = 1;

src/test/ui-fulldeps/dropck-tarena-cycle-checked.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | }
77
| -
88
| |
99
| `arena` dropped here while still borrowed
10-
| borrow might be used here, when `arena` is dropped and runs the `Drop` code for type `arena::TypedArena`
10+
| borrow might be used here, when `arena` is dropped and runs the `Drop` code for type `rustc_arena::TypedArena`
1111

1212
error: aborting due to previous error
1313

src/test/ui-fulldeps/dropck-tarena-unsound-drop.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | }
77
| -
88
| |
99
| `arena` dropped here while still borrowed
10-
| borrow might be used here, when `arena` is dropped and runs the `Drop` code for type `arena::TypedArena`
10+
| borrow might be used here, when `arena` is dropped and runs the `Drop` code for type `rustc_arena::TypedArena`
1111

1212
error: aborting due to previous error
1313

src/test/ui-fulldeps/empty-struct-braces-derive.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#![feature(rustc_private)]
55

6-
extern crate serialize as rustc_serialize;
6+
extern crate rustc_serialize;
77

88
#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash,
99
Default, Debug, RustcEncodable, RustcDecodable)]

src/test/ui-fulldeps/extern-mod-syntax.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#![allow(unused_imports)]
44
#![feature(rustc_private)]
55

6-
extern crate serialize;
7-
use serialize::json::Object;
6+
extern crate rustc_serialize;
7+
use rustc_serialize::json::Object;
88

99
pub fn main() {
1010
println!("Hello world!");

src/test/ui-fulldeps/issue-11881.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#![feature(rustc_private)]
88

9-
extern crate serialize as rustc_serialize;
9+
extern crate rustc_serialize;
1010

1111
use std::io::Cursor;
1212
use std::io::prelude::*;

src/test/ui-fulldeps/issue-14021.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
#![allow(unused_imports)]
55
#![feature(rustc_private)]
66

7-
extern crate serialize;
8-
extern crate serialize as rustc_serialize;
7+
extern crate rustc_serialize;
98

10-
use serialize::{Encodable, Decodable};
11-
use serialize::json;
9+
use rustc_serialize::{Encodable, Decodable};
10+
use rustc_serialize::json;
1211

1312
#[derive(RustcEncodable, RustcDecodable, PartialEq, Debug)]
1413
struct UnitLikeStruct;

src/test/ui-fulldeps/issue-15924.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
#![feature(rustc_private)]
88

9-
extern crate serialize;
9+
extern crate rustc_serialize;
1010

1111
use std::fmt;
12-
use serialize::{Encoder, Encodable};
13-
use serialize::json;
12+
use rustc_serialize::{Encoder, Encodable};
13+
use rustc_serialize::json;
1414

1515
struct Foo<T: Encodable> {
1616
v: T,

src/test/ui-fulldeps/issue-24972.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
#![allow(dead_code)]
44
#![feature(rustc_private)]
55

6-
extern crate serialize;
6+
extern crate rustc_serialize;
77

8-
use serialize::{Encodable, Decodable};
8+
use rustc_serialize::{Encodable, Decodable};
99
use std::fmt::Display;
1010

1111
pub trait Entity : Decodable + Encodable + Sized {

src/test/ui-fulldeps/issue-2804.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
#![allow(dead_code)]
55
#![feature(rustc_private)]
66

7-
extern crate serialize;
7+
extern crate rustc_serialize;
88

99
use std::collections::HashMap;
10-
use serialize::json::{self, Json};
10+
use rustc_serialize::json::{self, Json};
1111
use std::option;
1212

1313
enum object {

src/test/ui-fulldeps/issue-4016.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
#![feature(rustc_private)]
66

7-
extern crate serialize;
7+
extern crate rustc_serialize;
88

9-
use serialize::{json, Decodable};
9+
use rustc_serialize::{json, Decodable};
1010

1111
trait JD : Decodable {}
1212

src/test/ui-fulldeps/issue-4036.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
#![feature(rustc_private)]
88

9-
extern crate serialize;
9+
extern crate rustc_serialize;
1010

11-
use serialize::{json, Decodable};
11+
use rustc_serialize::{json, Decodable};
1212

1313
pub fn main() {
1414
let json = json::from_str("[1]").unwrap();

src/test/ui-fulldeps/rustc_encodable_hygiene.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#[allow(dead_code)]
66

7-
extern crate serialize as rustc_serialize;
7+
extern crate rustc_serialize;
88

99
#[derive(RustcDecodable, RustcEncodable,Debug)]
1010
struct A {

src/tools/clippy/clippy_lints/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
// FIXME: switch to something more ergonomic here, once available.
1717
// (Currently there is no way to opt into sysroot crates without `extern crate`.)
1818
#[allow(unused_extern_crates)]
19-
extern crate fmt_macros;
20-
#[allow(unused_extern_crates)]
2119
extern crate rustc_ast;
2220
#[allow(unused_extern_crates)]
2321
extern crate rustc_ast_pretty;
@@ -48,6 +46,8 @@ extern crate rustc_mir;
4846
#[allow(unused_extern_crates)]
4947
extern crate rustc_parse;
5048
#[allow(unused_extern_crates)]
49+
extern crate rustc_parse_format;
50+
#[allow(unused_extern_crates)]
5151
extern crate rustc_session;
5252
#[allow(unused_extern_crates)]
5353
extern crate rustc_span;

0 commit comments

Comments
 (0)