Skip to content

Commit

Permalink
Merge pull request #2574 from mark-i-m/i128
Browse files Browse the repository at this point in the history 
i128 is stabilizing
  • Loading branch information
@oli-obk
oli-obk authored Mar 26, 2018
2 parents 2dedbdc + e9f6a7c commit 9fb63d5
Show file tree
Hide file tree
Showing 3 changed files with 80 additions and 73 deletions.
6 changes: 4 additions & 2 deletions clippy_lints/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

#![feature(box_syntax)]
#![feature(custom_attribute)]
#![feature(i128_type)]
#![feature(i128)]
#![feature(rustc_private)]
#![feature(slice_patterns)]
#![feature(stmt_expr_attributes)]
Expand All @@ -13,6 +11,10 @@
#![allow(unknown_lints, indexing_slicing, shadow_reuse, missing_docs_in_private_items)]
#![recursion_limit = "256"]

// FIXME(mark-i-m) remove after i128 stablization merges
#![allow(stable_features)]
#![feature(i128, i128_type)]

#[macro_use]
extern crate rustc;
extern crate rustc_typeck;
Expand Down
7 changes: 6 additions & 1 deletion tests/ui/replace_consts.rs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
#![feature(integer_atomics, i128, i128_type)]
#![feature(integer_atomics)]
#![allow(blacklisted_name)]
#![deny(replace_consts)]

// FIXME(mark-i-m) remove after i128 stablization merges
#![allow(stable_features)]
#![feature(i128, i128_type)]

use std::sync::atomic::*;
use std::sync::{ONCE_INIT, Once};

Expand Down
140 changes: 70 additions & 70 deletions tests/ui/replace_consts.stderr
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
error: using `ATOMIC_BOOL_INIT`
--> $DIR/replace_consts.rs:11:17
--> $DIR/replace_consts.rs:16:17
|
11 | { let foo = ATOMIC_BOOL_INIT; };
16 | { let foo = ATOMIC_BOOL_INIT; };
| ^^^^^^^^^^^^^^^^ help: try this: `AtomicBool::new(false)`
|
note: lint level defined here
Expand All @@ -11,207 +11,207 @@ note: lint level defined here
| ^^^^^^^^^^^^^^

error: using `ATOMIC_ISIZE_INIT`
--> $DIR/replace_consts.rs:12:17
--> $DIR/replace_consts.rs:17:17
|
12 | { let foo = ATOMIC_ISIZE_INIT; };
17 | { let foo = ATOMIC_ISIZE_INIT; };
| ^^^^^^^^^^^^^^^^^ help: try this: `AtomicIsize::new(0)`

error: using `ATOMIC_I8_INIT`
--> $DIR/replace_consts.rs:13:17
--> $DIR/replace_consts.rs:18:17
|
13 | { let foo = ATOMIC_I8_INIT; };
18 | { let foo = ATOMIC_I8_INIT; };
| ^^^^^^^^^^^^^^ help: try this: `AtomicI8::new(0)`

error: using `ATOMIC_I16_INIT`
--> $DIR/replace_consts.rs:14:17
--> $DIR/replace_consts.rs:19:17
|
14 | { let foo = ATOMIC_I16_INIT; };
19 | { let foo = ATOMIC_I16_INIT; };
| ^^^^^^^^^^^^^^^ help: try this: `AtomicI16::new(0)`

error: using `ATOMIC_I32_INIT`
--> $DIR/replace_consts.rs:15:17
--> $DIR/replace_consts.rs:20:17
|
15 | { let foo = ATOMIC_I32_INIT; };
20 | { let foo = ATOMIC_I32_INIT; };
| ^^^^^^^^^^^^^^^ help: try this: `AtomicI32::new(0)`

error: using `ATOMIC_I64_INIT`
--> $DIR/replace_consts.rs:16:17
--> $DIR/replace_consts.rs:21:17
|
16 | { let foo = ATOMIC_I64_INIT; };
21 | { let foo = ATOMIC_I64_INIT; };
| ^^^^^^^^^^^^^^^ help: try this: `AtomicI64::new(0)`

error: using `ATOMIC_USIZE_INIT`
--> $DIR/replace_consts.rs:17:17
--> $DIR/replace_consts.rs:22:17
|
17 | { let foo = ATOMIC_USIZE_INIT; };
22 | { let foo = ATOMIC_USIZE_INIT; };
| ^^^^^^^^^^^^^^^^^ help: try this: `AtomicUsize::new(0)`

error: using `ATOMIC_U8_INIT`
--> $DIR/replace_consts.rs:18:17
--> $DIR/replace_consts.rs:23:17
|
18 | { let foo = ATOMIC_U8_INIT; };
23 | { let foo = ATOMIC_U8_INIT; };
| ^^^^^^^^^^^^^^ help: try this: `AtomicU8::new(0)`

error: using `ATOMIC_U16_INIT`
--> $DIR/replace_consts.rs:19:17
--> $DIR/replace_consts.rs:24:17
|
19 | { let foo = ATOMIC_U16_INIT; };
24 | { let foo = ATOMIC_U16_INIT; };
| ^^^^^^^^^^^^^^^ help: try this: `AtomicU16::new(0)`

error: using `ATOMIC_U32_INIT`
--> $DIR/replace_consts.rs:20:17
--> $DIR/replace_consts.rs:25:17
|
20 | { let foo = ATOMIC_U32_INIT; };
25 | { let foo = ATOMIC_U32_INIT; };
| ^^^^^^^^^^^^^^^ help: try this: `AtomicU32::new(0)`

error: using `ATOMIC_U64_INIT`
--> $DIR/replace_consts.rs:21:17
--> $DIR/replace_consts.rs:26:17
|
21 | { let foo = ATOMIC_U64_INIT; };
26 | { let foo = ATOMIC_U64_INIT; };
| ^^^^^^^^^^^^^^^ help: try this: `AtomicU64::new(0)`

error: using `MIN`
--> $DIR/replace_consts.rs:23:17
--> $DIR/replace_consts.rs:28:17
|
23 | { let foo = std::isize::MIN; };
28 | { let foo = std::isize::MIN; };
| ^^^^^^^^^^^^^^^ help: try this: `isize::min_value()`

error: using `MIN`
--> $DIR/replace_consts.rs:24:17
--> $DIR/replace_consts.rs:29:17
|
24 | { let foo = std::i8::MIN; };
29 | { let foo = std::i8::MIN; };
| ^^^^^^^^^^^^ help: try this: `i8::min_value()`

error: using `MIN`
--> $DIR/replace_consts.rs:25:17
--> $DIR/replace_consts.rs:30:17
|
25 | { let foo = std::i16::MIN; };
30 | { let foo = std::i16::MIN; };
| ^^^^^^^^^^^^^ help: try this: `i16::min_value()`

error: using `MIN`
--> $DIR/replace_consts.rs:26:17
--> $DIR/replace_consts.rs:31:17
|
26 | { let foo = std::i32::MIN; };
31 | { let foo = std::i32::MIN; };
| ^^^^^^^^^^^^^ help: try this: `i32::min_value()`

error: using `MIN`
--> $DIR/replace_consts.rs:27:17
--> $DIR/replace_consts.rs:32:17
|
27 | { let foo = std::i64::MIN; };
32 | { let foo = std::i64::MIN; };
| ^^^^^^^^^^^^^ help: try this: `i64::min_value()`

error: using `MIN`
--> $DIR/replace_consts.rs:28:17
--> $DIR/replace_consts.rs:33:17
|
28 | { let foo = std::i128::MIN; };
33 | { let foo = std::i128::MIN; };
| ^^^^^^^^^^^^^^ help: try this: `i128::min_value()`

error: using `MIN`
--> $DIR/replace_consts.rs:29:17
--> $DIR/replace_consts.rs:34:17
|
29 | { let foo = std::usize::MIN; };
34 | { let foo = std::usize::MIN; };
| ^^^^^^^^^^^^^^^ help: try this: `usize::min_value()`

error: using `MIN`
--> $DIR/replace_consts.rs:30:17
--> $DIR/replace_consts.rs:35:17
|
30 | { let foo = std::u8::MIN; };
35 | { let foo = std::u8::MIN; };
| ^^^^^^^^^^^^ help: try this: `u8::min_value()`

error: using `MIN`
--> $DIR/replace_consts.rs:31:17
--> $DIR/replace_consts.rs:36:17
|
31 | { let foo = std::u16::MIN; };
36 | { let foo = std::u16::MIN; };
| ^^^^^^^^^^^^^ help: try this: `u16::min_value()`

error: using `MIN`
--> $DIR/replace_consts.rs:32:17
--> $DIR/replace_consts.rs:37:17
|
32 | { let foo = std::u32::MIN; };
37 | { let foo = std::u32::MIN; };
| ^^^^^^^^^^^^^ help: try this: `u32::min_value()`

error: using `MIN`
--> $DIR/replace_consts.rs:33:17
--> $DIR/replace_consts.rs:38:17
|
33 | { let foo = std::u64::MIN; };
38 | { let foo = std::u64::MIN; };
| ^^^^^^^^^^^^^ help: try this: `u64::min_value()`

error: using `MIN`
--> $DIR/replace_consts.rs:34:17
--> $DIR/replace_consts.rs:39:17
|
34 | { let foo = std::u128::MIN; };
39 | { let foo = std::u128::MIN; };
| ^^^^^^^^^^^^^^ help: try this: `u128::min_value()`

error: using `MAX`
--> $DIR/replace_consts.rs:36:17
--> $DIR/replace_consts.rs:41:17
|
36 | { let foo = std::isize::MAX; };
41 | { let foo = std::isize::MAX; };
| ^^^^^^^^^^^^^^^ help: try this: `isize::max_value()`

error: using `MAX`
--> $DIR/replace_consts.rs:37:17
--> $DIR/replace_consts.rs:42:17
|
37 | { let foo = std::i8::MAX; };
42 | { let foo = std::i8::MAX; };
| ^^^^^^^^^^^^ help: try this: `i8::max_value()`

error: using `MAX`
--> $DIR/replace_consts.rs:38:17
--> $DIR/replace_consts.rs:43:17
|
38 | { let foo = std::i16::MAX; };
43 | { let foo = std::i16::MAX; };
| ^^^^^^^^^^^^^ help: try this: `i16::max_value()`

error: using `MAX`
--> $DIR/replace_consts.rs:39:17
--> $DIR/replace_consts.rs:44:17
|
39 | { let foo = std::i32::MAX; };
44 | { let foo = std::i32::MAX; };
| ^^^^^^^^^^^^^ help: try this: `i32::max_value()`

error: using `MAX`
--> $DIR/replace_consts.rs:40:17
--> $DIR/replace_consts.rs:45:17
|
40 | { let foo = std::i64::MAX; };
45 | { let foo = std::i64::MAX; };
| ^^^^^^^^^^^^^ help: try this: `i64::max_value()`

error: using `MAX`
--> $DIR/replace_consts.rs:41:17
--> $DIR/replace_consts.rs:46:17
|
41 | { let foo = std::i128::MAX; };
46 | { let foo = std::i128::MAX; };
| ^^^^^^^^^^^^^^ help: try this: `i128::max_value()`

error: using `MAX`
--> $DIR/replace_consts.rs:42:17
--> $DIR/replace_consts.rs:47:17
|
42 | { let foo = std::usize::MAX; };
47 | { let foo = std::usize::MAX; };
| ^^^^^^^^^^^^^^^ help: try this: `usize::max_value()`

error: using `MAX`
--> $DIR/replace_consts.rs:43:17
--> $DIR/replace_consts.rs:48:17
|
43 | { let foo = std::u8::MAX; };
48 | { let foo = std::u8::MAX; };
| ^^^^^^^^^^^^ help: try this: `u8::max_value()`

error: using `MAX`
--> $DIR/replace_consts.rs:44:17
--> $DIR/replace_consts.rs:49:17
|
44 | { let foo = std::u16::MAX; };
49 | { let foo = std::u16::MAX; };
| ^^^^^^^^^^^^^ help: try this: `u16::max_value()`

error: using `MAX`
--> $DIR/replace_consts.rs:45:17
--> $DIR/replace_consts.rs:50:17
|
45 | { let foo = std::u32::MAX; };
50 | { let foo = std::u32::MAX; };
| ^^^^^^^^^^^^^ help: try this: `u32::max_value()`

error: using `MAX`
--> $DIR/replace_consts.rs:46:17
--> $DIR/replace_consts.rs:51:17
|
46 | { let foo = std::u64::MAX; };
51 | { let foo = std::u64::MAX; };
| ^^^^^^^^^^^^^ help: try this: `u64::max_value()`

error: using `MAX`
--> $DIR/replace_consts.rs:47:17
--> $DIR/replace_consts.rs:52:17
|
47 | { let foo = std::u128::MAX; };
52 | { let foo = std::u128::MAX; };
| ^^^^^^^^^^^^^^ help: try this: `u128::max_value()`

error: aborting due to 35 previous errors
Expand Down

0 comments on commit 9fb63d5

Please sign in to comment.