Skip to content

Commit 50a1fd1

Browse files
oli-obkoli-obk
authored
Merge pull request #1833 from messense/feature/fix-nightly-06-16
rustup to rustc 1.19.0-nightly (258ae6d 2017-06-15)
2 parents 3873c61 + faf7bf6 commit 50a1fd1

File tree

4 files changed

+18
-50
lines changed

4 files changed

+18
-50
lines changed

‎clippy_lints/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// error-pattern:cargo-clippy
22

33
#![feature(box_syntax)]
4-
#![feature(collections)]
4+
#![feature(alloc)]
55
#![feature(custom_attribute)]
66
#![feature(i128_type)]
77
#![feature(i128)]
@@ -22,7 +22,7 @@ extern crate toml;
2222

2323
// Only for the compile time checking of paths
2424
extern crate core;
25-
extern crate collections;
25+
extern crate alloc;
2626

2727
// for unicode nfc normalization
2828
extern crate unicode_normalization;

‎clippy_lints/src/utils/paths.rs

+13-13
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
pub const ASMUT_TRAIT: [&'static str; 3] = ["core", "convert", "AsMut"];
44
pub const ASREF_TRAIT: [&'static str; 3] = ["core", "convert", "AsRef"];
55
pub const BEGIN_PANIC: [&'static str; 3] = ["std", "panicking", "begin_panic"];
6-
pub const BINARY_HEAP: [&'static str; 3] = ["collections", "binary_heap", "BinaryHeap"];
6+
pub const BINARY_HEAP: [&'static str; 3] = ["alloc", "binary_heap", "BinaryHeap"];
77
pub const BORROW_TRAIT: [&'static str; 3] = ["core", "borrow", "Borrow"];
88
pub const BOX: [&'static str; 3] = ["std", "boxed", "Box"];
99
pub const BOX_NEW: [&'static str; 4] = ["std", "boxed", "Box", "new"];
10-
pub const BTREEMAP: [&'static str; 4] = ["collections", "btree", "map", "BTreeMap"];
11-
pub const BTREEMAP_ENTRY: [&'static str; 4] = ["collections", "btree", "map", "Entry"];
12-
pub const BTREESET: [&'static str; 4] = ["collections", "btree", "set", "BTreeSet"];
10+
pub const BTREEMAP: [&'static str; 4] = ["alloc", "btree", "map", "BTreeMap"];
11+
pub const BTREEMAP_ENTRY: [&'static str; 4] = ["alloc", "btree", "map", "Entry"];
12+
pub const BTREESET: [&'static str; 4] = ["alloc", "btree", "set", "BTreeSet"];
1313
pub const CLONE: [&'static str; 4] = ["core", "clone", "Clone", "clone"];
1414
pub const CLONE_TRAIT: [&'static str; 3] = ["core", "clone", "Clone"];
1515
pub const CMP_MAX: [&'static str; 3] = ["core", "cmp", "max"];
1616
pub const CMP_MIN: [&'static str; 3] = ["core", "cmp", "min"];
17-
pub const COW: [&'static str; 3] = ["collections", "borrow", "Cow"];
17+
pub const COW: [&'static str; 3] = ["alloc", "borrow", "Cow"];
1818
pub const CSTRING_NEW: [&'static str; 5] = ["std", "ffi", "c_str", "CString", "new"];
1919
pub const DEBUG_FMT_METHOD: [&'static str; 4] = ["core", "fmt", "Debug", "fmt"];
2020
pub const DEFAULT_TRAIT: [&'static str; 3] = ["core", "default", "Default"];
@@ -31,7 +31,7 @@ pub const IO_PRINT: [&'static str; 4] = ["std", "io", "stdio", "_print"];
3131
pub const IO_READ: [&'static str; 3] = ["std", "io", "Read"];
3232
pub const IO_WRITE: [&'static str; 3] = ["std", "io", "Write"];
3333
pub const ITERATOR: [&'static str; 4] = ["core", "iter", "iterator", "Iterator"];
34-
pub const LINKED_LIST: [&'static str; 3] = ["collections", "linked_list", "LinkedList"];
34+
pub const LINKED_LIST: [&'static str; 3] = ["alloc", "linked_list", "LinkedList"];
3535
pub const LINT: [&'static str; 3] = ["rustc", "lint", "Lint"];
3636
pub const LINT_ARRAY: [&'static str; 3] = ["rustc", "lint", "LintArray"];
3737
pub const MEM_FORGET: [&'static str; 3] = ["core", "mem", "forget"];
@@ -67,12 +67,12 @@ pub const RESULT: [&'static str; 3] = ["core", "result", "Result"];
6767
pub const RESULT_ERR: [&'static str; 4] = ["core", "result", "Result", "Err"];
6868
pub const RESULT_OK: [&'static str; 4] = ["core", "result", "Result", "Ok"];
6969
pub const SERDE_DE_VISITOR: [&'static str; 3] = ["serde", "de", "Visitor"];
70-
pub const SLICE_INTO_VEC: [&'static str; 4] = ["collections", "slice", "<impl [T]>", "into_vec"];
71-
pub const STRING: [&'static str; 3] = ["collections", "string", "String"];
72-
pub const TO_OWNED: [&'static str; 3] = ["collections", "borrow", "ToOwned"];
73-
pub const TO_STRING: [&'static str; 3] = ["collections", "string", "ToString"];
70+
pub const SLICE_INTO_VEC: [&'static str; 4] = ["alloc", "slice", "<impl [T]>", "into_vec"];
71+
pub const STRING: [&'static str; 3] = ["alloc", "string", "String"];
72+
pub const TO_OWNED: [&'static str; 3] = ["alloc", "borrow", "ToOwned"];
73+
pub const TO_STRING: [&'static str; 3] = ["alloc", "string", "ToString"];
7474
pub const TRANSMUTE: [&'static str; 4] = ["core", "intrinsics", "", "transmute"];
7575
pub const TRY_INTO_RESULT: [&'static str; 4] = ["std", "ops", "Try", "into_result"];
76-
pub const VEC: [&'static str; 3] = ["collections", "vec", "Vec"];
77-
pub const VEC_DEQUE: [&'static str; 3] = ["collections", "vec_deque", "VecDeque"];
78-
pub const VEC_FROM_ELEM: [&'static str; 3] = ["collections", "vec", "from_elem"];
76+
pub const VEC: [&'static str; 3] = ["alloc", "vec", "Vec"];
77+
pub const VEC_DEQUE: [&'static str; 3] = ["alloc", "vec_deque", "VecDeque"];
78+
pub const VEC_FROM_ELEM: [&'static str; 3] = ["alloc", "vec", "from_elem"];

‎clippy_tests/examples/dlist.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
#![feature(plugin, collections)]
1+
#![feature(plugin, alloc)]
22
#![feature(associated_type_defaults)]
33
#![feature(associated_consts)]
44

55
#![plugin(clippy)]
66
#![warn(clippy)]
77
#![allow(dead_code, needless_pass_by_value)]
88

9-
extern crate collections;
10-
use collections::linked_list::LinkedList;
9+
extern crate alloc;
10+
use alloc::linked_list::LinkedList;
1111

1212
trait Foo {
1313
type Baz = LinkedList<u8>;

‎clippy_tests/examples/range.stderr

-32
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
error: Range::step_by(0) produces an infinite iterator. Consider using `std::iter::repeat()` instead
2-
--> range.rs:13:5
3-
|
4-
13 | (0..1).step_by(0);
5-
| ^^^^^^^^^^^^^^^^^
6-
|
7-
= note: `-D range-step-by-zero` implied by `-D warnings`
8-
91
error: use of deprecated item: replaced by `Iterator::step_by`
102
--> range.rs:13:12
113
|
@@ -22,14 +14,6 @@ error: use of deprecated item: replaced by `Iterator::step_by`
2214
|
2315
= note: `-D deprecated` implied by `-D warnings`
2416

25-
error: Range::step_by(0) produces an infinite iterator. Consider using `std::iter::repeat()` instead
26-
--> range.rs:17:5
27-
|
28-
17 | (1..).step_by(0);
29-
| ^^^^^^^^^^^^^^^^
30-
|
31-
= note: `-D range-step-by-zero` implied by `-D warnings`
32-
3317
error: use of deprecated item: replaced by `Iterator::step_by`
3418
--> range.rs:17:11
3519
|
@@ -38,14 +22,6 @@ error: use of deprecated item: replaced by `Iterator::step_by`
3822
|
3923
= note: `-D deprecated` implied by `-D warnings`
4024

41-
error: Range::step_by(0) produces an infinite iterator. Consider using `std::iter::repeat()` instead
42-
--> range.rs:18:5
43-
|
44-
18 | (1...2).step_by(0);
45-
| ^^^^^^^^^^^^^^^^^^
46-
|
47-
= note: `-D range-step-by-zero` implied by `-D warnings`
48-
4925
error: use of deprecated item: replaced by `Iterator::step_by`
5026
--> range.rs:18:13
5127
|
@@ -54,14 +30,6 @@ error: use of deprecated item: replaced by `Iterator::step_by`
5430
|
5531
= note: `-D deprecated` implied by `-D warnings`
5632

57-
error: Range::step_by(0) produces an infinite iterator. Consider using `std::iter::repeat()` instead
58-
--> range.rs:21:5
59-
|
60-
21 | x.step_by(0);
61-
| ^^^^^^^^^^^^
62-
|
63-
= note: `-D range-step-by-zero` implied by `-D warnings`
64-
6533
error: use of deprecated item: replaced by `Iterator::step_by`
6634
--> range.rs:21:7
6735
|

0 commit comments

Comments
 (0)