Skip to content

Commit a88b36b

Browse files
faernfaern
committed
Stop importing int/float modules in libcore
1 parent fff4f08 commit a88b36b

File tree

8 files changed

+23
-39
lines changed

8 files changed

+23
-39
lines changed

‎src/libcore/benches/num/flt2dec/strategy/dragon.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use super::super::*;
22
use core::num::flt2dec::strategy::dragon::*;
3-
use std::{f64, i16};
43
use test::Bencher;
54

65
#[bench]

‎src/libcore/benches/num/flt2dec/strategy/grisu.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use super::super::*;
22
use core::num::flt2dec::strategy::grisu::*;
3-
use std::{f64, i16};
43
use test::Bencher;
54

65
pub fn decode_finite<T: DecodableFloat>(v: T) -> Decoded {

‎src/libcore/tests/fmt/num.rs

-4
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ fn test_format_int() {
104104

105105
#[test]
106106
fn test_format_int_exp_limits() {
107-
use core::{i128, i16, i32, i64, i8, u128, u16, u32, u64, u8};
108107
assert_eq!(format!("{:e}", i8::MIN), "-1.28e2");
109108
assert_eq!(format!("{:e}", i8::MAX), "1.27e2");
110109
assert_eq!(format!("{:e}", i16::MIN), "-3.2768e4");
@@ -125,8 +124,6 @@ fn test_format_int_exp_limits() {
125124

126125
#[test]
127126
fn test_format_int_exp_precision() {
128-
use core::{i128, i16, i32, i64, i8};
129-
130127
//test that float and integer match
131128
let big_int: u32 = 314_159_265;
132129
assert_eq!(format!("{:.1e}", big_int), format!("{:.1e}", f64::from(big_int)));
@@ -214,7 +211,6 @@ fn test_format_int_sign_padding() {
214211

215212
#[test]
216213
fn test_format_int_twos_complement() {
217-
use core::{i16, i32, i64, i8};
218214
assert_eq!(format!("{}", i8::MIN), "-128");
219215
assert_eq!(format!("{}", i16::MIN), "-32768");
220216
assert_eq!(format!("{}", i32::MIN), "-2147483648");

‎src/libcore/tests/iter.rs

+22-28
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
use core::cell::Cell;
44
use core::convert::TryFrom;
55
use core::iter::*;
6-
use core::usize;
7-
use core::{i16, i8, isize};
86

97
#[test]
108
fn test_lt() {
@@ -2251,62 +2249,58 @@ fn test_range_inclusive_folds() {
22512249

22522250
#[test]
22532251
fn test_range_size_hint() {
2254-
use core::usize::MAX as UMAX;
22552252
assert_eq!((0..0usize).size_hint(), (0, Some(0)));
22562253
assert_eq!((0..100usize).size_hint(), (100, Some(100)));
2257-
assert_eq!((0..UMAX).size_hint(), (UMAX, Some(UMAX)));
2254+
assert_eq!((0..usize::MAX).size_hint(), (usize::MAX, Some(usize::MAX)));
22582255

2259-
let umax = u128::try_from(UMAX).unwrap();
2256+
let umax = u128::try_from(usize::MAX).unwrap();
22602257
assert_eq!((0..0u128).size_hint(), (0, Some(0)));
22612258
assert_eq!((0..100u128).size_hint(), (100, Some(100)));
2262-
assert_eq!((0..umax).size_hint(), (UMAX, Some(UMAX)));
2263-
assert_eq!((0..umax + 1).size_hint(), (UMAX, None));
2259+
assert_eq!((0..umax).size_hint(), (usize::MAX, Some(usize::MAX)));
2260+
assert_eq!((0..umax + 1).size_hint(), (usize::MAX, None));
22642261

2265-
use core::isize::{MAX as IMAX, MIN as IMIN};
22662262
assert_eq!((0..0isize).size_hint(), (0, Some(0)));
22672263
assert_eq!((-100..100isize).size_hint(), (200, Some(200)));
2268-
assert_eq!((IMIN..IMAX).size_hint(), (UMAX, Some(UMAX)));
2264+
assert_eq!((isize::MIN..isize::MAX).size_hint(), (usize::MAX, Some(usize::MAX)));
22692265

2270-
let imin = i128::try_from(IMIN).unwrap();
2271-
let imax = i128::try_from(IMAX).unwrap();
2266+
let imin = i128::try_from(isize::MIN).unwrap();
2267+
let imax = i128::try_from(isize::MAX).unwrap();
22722268
assert_eq!((0..0i128).size_hint(), (0, Some(0)));
22732269
assert_eq!((-100..100i128).size_hint(), (200, Some(200)));
2274-
assert_eq!((imin..imax).size_hint(), (UMAX, Some(UMAX)));
2275-
assert_eq!((imin..imax + 1).size_hint(), (UMAX, None));
2270+
assert_eq!((imin..imax).size_hint(), (usize::MAX, Some(usize::MAX)));
2271+
assert_eq!((imin..imax + 1).size_hint(), (usize::MAX, None));
22762272
}
22772273

22782274
#[test]
22792275
fn test_range_inclusive_size_hint() {
2280-
use core::usize::MAX as UMAX;
22812276
assert_eq!((1..=0usize).size_hint(), (0, Some(0)));
22822277
assert_eq!((0..=0usize).size_hint(), (1, Some(1)));
22832278
assert_eq!((0..=100usize).size_hint(), (101, Some(101)));
2284-
assert_eq!((0..=UMAX - 1).size_hint(), (UMAX, Some(UMAX)));
2285-
assert_eq!((0..=UMAX).size_hint(), (UMAX, None));
2279+
assert_eq!((0..=usize::MAX - 1).size_hint(), (usize::MAX, Some(usize::MAX)));
2280+
assert_eq!((0..=usize::MAX).size_hint(), (usize::MAX, None));
22862281

2287-
let umax = u128::try_from(UMAX).unwrap();
2282+
let umax = u128::try_from(usize::MAX).unwrap();
22882283
assert_eq!((1..=0u128).size_hint(), (0, Some(0)));
22892284
assert_eq!((0..=0u128).size_hint(), (1, Some(1)));
22902285
assert_eq!((0..=100u128).size_hint(), (101, Some(101)));
2291-
assert_eq!((0..=umax - 1).size_hint(), (UMAX, Some(UMAX)));
2292-
assert_eq!((0..=umax).size_hint(), (UMAX, None));
2293-
assert_eq!((0..=umax + 1).size_hint(), (UMAX, None));
2286+
assert_eq!((0..=umax - 1).size_hint(), (usize::MAX, Some(usize::MAX)));
2287+
assert_eq!((0..=umax).size_hint(), (usize::MAX, None));
2288+
assert_eq!((0..=umax + 1).size_hint(), (usize::MAX, None));
22942289

2295-
use core::isize::{MAX as IMAX, MIN as IMIN};
22962290
assert_eq!((0..=-1isize).size_hint(), (0, Some(0)));
22972291
assert_eq!((0..=0isize).size_hint(), (1, Some(1)));
22982292
assert_eq!((-100..=100isize).size_hint(), (201, Some(201)));
2299-
assert_eq!((IMIN..=IMAX - 1).size_hint(), (UMAX, Some(UMAX)));
2300-
assert_eq!((IMIN..=IMAX).size_hint(), (UMAX, None));
2293+
assert_eq!((isize::MIN..=isize::MAX - 1).size_hint(), (usize::MAX, Some(usize::MAX)));
2294+
assert_eq!((isize::MIN..=isize::MAX).size_hint(), (usize::MAX, None));
23012295

2302-
let imin = i128::try_from(IMIN).unwrap();
2303-
let imax = i128::try_from(IMAX).unwrap();
2296+
let imin = i128::try_from(isize::MIN).unwrap();
2297+
let imax = i128::try_from(isize::MAX).unwrap();
23042298
assert_eq!((0..=-1i128).size_hint(), (0, Some(0)));
23052299
assert_eq!((0..=0i128).size_hint(), (1, Some(1)));
23062300
assert_eq!((-100..=100i128).size_hint(), (201, Some(201)));
2307-
assert_eq!((imin..=imax - 1).size_hint(), (UMAX, Some(UMAX)));
2308-
assert_eq!((imin..=imax).size_hint(), (UMAX, None));
2309-
assert_eq!((imin..=imax + 1).size_hint(), (UMAX, None));
2301+
assert_eq!((imin..=imax - 1).size_hint(), (usize::MAX, Some(usize::MAX)));
2302+
assert_eq!((imin..=imax).size_hint(), (usize::MAX, None));
2303+
assert_eq!((imin..=imax + 1).size_hint(), (usize::MAX, None));
23102304
}
23112305

23122306
#[test]

‎src/libcore/tests/num/dec2flt/mod.rs

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

3-
use std::{f32, f64, i64};
4-
53
mod parse;
64
mod rawfp;
75

‎src/libcore/tests/num/flt2dec/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use std::{f32, f64, fmt, i16, str};
1+
use std::{fmt, str};
22

33
use core::num::flt2dec::{decode, DecodableFloat, Decoded, FullDecoded};
44
use core::num::flt2dec::{round_up, Formatted, Part, Sign, MAX_SIG_DIGITS};

‎src/libcore/tests/num/flt2dec/random.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#![cfg(not(target_arch = "wasm32"))]
22

3-
use std::i16;
43
use std::str;
54

65
use core::num::flt2dec::strategy::grisu::format_exact_opt;

‎src/libcore/tests/num/int_macros.rs

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ macro_rules! int_module {
22
($T:ident, $T_i:ident) => {
33
#[cfg(test)]
44
mod tests {
5-
use core::isize;
65
use core::mem;
76
use core::ops::{BitAnd, BitOr, BitXor, Not, Shl, Shr};
87
use core::$T_i::*;

0 commit comments

Comments
 (0)