Skip to content

Commit b1f209b

Browse files
cuvipercuviper
committed
Upgrade to 2018 edition
1 parent 543e0c9 commit b1f209b

File tree

10 files changed

+35
-49
lines changed

10 files changed

+35
-49
lines changed

‎Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ version = "0.1.45"
1212
readme = "README.md"
1313
build = "build.rs"
1414
exclude = ["/bors.toml", "/ci/*", "/.github/*"]
15+
edition = "2018"
1516

1617
[package.metadata.docs.rs]
1718
features = ["std"]

‎benches/average.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
33
#![feature(test)]
44

5-
extern crate num_integer;
6-
extern crate num_traits;
75
extern crate test;
86

97
use num_integer::Integer;

‎benches/gcd.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
33
#![feature(test)]
44

5-
extern crate num_integer;
6-
extern crate num_traits;
75
extern crate test;
86

97
use num_integer::Integer;

‎benches/roots.rs‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
33
#![feature(test)]
44

5-
extern crate num_integer;
6-
extern crate num_traits;
75
extern crate test;
86

97
use num_integer::Integer;
@@ -125,42 +123,42 @@ macro_rules! bench_roots {
125123

126124
#[bench]
127125
fn sqrt_rand(b: &mut Bencher) {
128-
::bench_rand_pos(b, $T::sqrt, 2);
126+
crate::bench_rand_pos(b, $T::sqrt, 2);
129127
}
130128

131129
#[bench]
132130
fn sqrt_small(b: &mut Bencher) {
133-
::bench_small_pos(b, $T::sqrt, 2);
131+
crate::bench_small_pos(b, $T::sqrt, 2);
134132
}
135133

136134
#[bench]
137135
fn cbrt_rand(b: &mut Bencher) {
138-
::bench_rand(b, $T::cbrt, 3);
136+
crate::bench_rand(b, $T::cbrt, 3);
139137
}
140138

141139
#[bench]
142140
fn cbrt_small(b: &mut Bencher) {
143-
::bench_small(b, $T::cbrt, 3);
141+
crate::bench_small(b, $T::cbrt, 3);
144142
}
145143

146144
#[bench]
147145
fn fourth_root_rand(b: &mut Bencher) {
148-
::bench_rand_pos(b, |x: &$T| x.nth_root(4), 4);
146+
crate::bench_rand_pos(b, |x: &$T| x.nth_root(4), 4);
149147
}
150148

151149
#[bench]
152150
fn fourth_root_small(b: &mut Bencher) {
153-
::bench_small_pos(b, |x: &$T| x.nth_root(4), 4);
151+
crate::bench_small_pos(b, |x: &$T| x.nth_root(4), 4);
154152
}
155153

156154
#[bench]
157155
fn fifth_root_rand(b: &mut Bencher) {
158-
::bench_rand(b, |x: &$T| x.nth_root(5), 5);
156+
crate::bench_rand(b, |x: &$T| x.nth_root(5), 5);
159157
}
160158

161159
#[bench]
162160
fn fifth_root_small(b: &mut Bencher) {
163-
::bench_small(b, |x: &$T| x.nth_root(5), 5);
161+
crate::bench_small(b, |x: &$T| x.nth_root(5), 5);
164162
}
165163
}
166164
)*}

‎build.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
extern crate autocfg;
2-
31
use std::env;
42

53
fn main() {

‎src/average.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
use crate::Integer;
12
use core::ops::{BitAnd, BitOr, BitXor, Shr};
2-
use Integer;
33

44
/// Provides methods to compute the average of two integers, without overflows.
55
pub trait Average: Integer {

‎src/lib.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ extern crate num_traits as traits;
2424
use core::mem;
2525
use core::ops::Add;
2626

27-
use traits::{Num, Signed, Zero};
27+
use crate::traits::{Num, Signed, Zero};
2828

2929
mod roots;
30-
pub use roots::Roots;
31-
pub use roots::{cbrt, nth_root, sqrt};
30+
pub use crate::roots::Roots;
31+
pub use crate::roots::{cbrt, nth_root, sqrt};
3232

3333
mod average;
34-
pub use average::Average;
35-
pub use average::{average_ceil, average_floor};
34+
pub use crate::average::Average;
35+
pub use crate::average::{average_ceil, average_floor};
3636

3737
pub trait Integer: Sized + Num + PartialOrd + Ord + Eq {
3838
/// Floored integer division.
@@ -590,8 +590,8 @@ macro_rules! impl_integer_for_isize {
590590

591591
#[cfg(test)]
592592
mod $test_mod {
593+
use crate::Integer;
593594
use core::mem;
594-
use Integer;
595595

596596
/// Checks that the division rule holds for:
597597
///
@@ -758,9 +758,9 @@ macro_rules! impl_integer_for_isize {
758758

759759
#[test]
760760
fn test_extended_gcd_lcm() {
761+
use crate::traits::NumAssign;
762+
use crate::ExtendedGcd;
761763
use core::fmt::Debug;
762-
use traits::NumAssign;
763-
use ExtendedGcd;
764764

765765
fn check<A: Copy + Debug + Integer + NumAssign>(a: A, b: A) {
766766
let ExtendedGcd { gcd, x, y, .. } = a.extended_gcd(&b);
@@ -945,8 +945,8 @@ macro_rules! impl_integer_for_usize {
945945

946946
#[cfg(test)]
947947
mod $test_mod {
948+
use crate::Integer;
948949
use core::mem;
949-
use Integer;
950950

951951
#[test]
952952
fn test_div_mod_floor() {

‎src/roots.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
use core;
1+
use crate::traits::checked_pow;
2+
use crate::traits::PrimInt;
3+
use crate::Integer;
24
use core::mem;
3-
use traits::checked_pow;
4-
use traits::PrimInt;
5-
use Integer;
65

76
/// Provides methods to compute an integer's square root, cube root,
87
/// and arbitrary `n`th root.

‎tests/average.rs‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
extern crate num_integer;
2-
extern crate num_traits;
3-
41
macro_rules! test_average {
52
($I:ident, $U:ident) => {
63
mod $I {
@@ -12,7 +9,7 @@ macro_rules! test_average {
129
assert_eq!((14 as $I).average_ceil(&16), 15 as $I);
1310
assert_eq!((14 as $I).average_ceil(&17), 16 as $I);
1411

15-
let max = $crate::std::$I::MAX;
12+
let max = std::$I::MAX;
1613
assert_eq!((max - 3).average_ceil(&(max - 1)), max - 2);
1714
assert_eq!((max - 3).average_ceil(&(max - 2)), max - 2);
1815
}
@@ -22,8 +19,8 @@ macro_rules! test_average {
2219
assert_eq!((14 as $I).average_ceil(&-4), 5 as $I);
2320
assert_eq!((14 as $I).average_ceil(&-5), 5 as $I);
2421

25-
let min = $crate::std::$I::MIN;
26-
let max = $crate::std::$I::MAX;
22+
let min = std::$I::MIN;
23+
let max = std::$I::MAX;
2724
assert_eq!(min.average_ceil(&max), 0 as $I);
2825
}
2926
}
@@ -36,7 +33,7 @@ macro_rules! test_average {
3633
assert_eq!((14 as $I).average_floor(&16), 15 as $I);
3734
assert_eq!((14 as $I).average_floor(&17), 15 as $I);
3835

39-
let max = $crate::std::$I::MAX;
36+
let max = std::$I::MAX;
4037
assert_eq!((max - 3).average_floor(&(max - 1)), max - 2);
4138
assert_eq!((max - 3).average_floor(&(max - 2)), max - 3);
4239
}
@@ -46,8 +43,8 @@ macro_rules! test_average {
4643
assert_eq!((14 as $I).average_floor(&-4), 5 as $I);
4744
assert_eq!((14 as $I).average_floor(&-5), 4 as $I);
4845

49-
let min = $crate::std::$I::MIN;
50-
let max = $crate::std::$I::MAX;
46+
let min = std::$I::MIN;
47+
let max = std::$I::MAX;
5148
assert_eq!(min.average_floor(&max), -1 as $I);
5249
}
5350
}
@@ -65,7 +62,7 @@ macro_rules! test_average {
6562

6663
#[test]
6764
fn overflow() {
68-
let max = $crate::std::$U::MAX;
65+
let max = std::$U::MAX;
6966
assert_eq!((max - 3).average_ceil(&(max - 1)), max - 2);
7067
assert_eq!((max - 3).average_ceil(&(max - 2)), max - 2);
7168
}
@@ -82,7 +79,7 @@ macro_rules! test_average {
8279

8380
#[test]
8481
fn overflow() {
85-
let max = $crate::std::$U::MAX;
82+
let max = std::$U::MAX;
8683
assert_eq!((max - 3).average_floor(&(max - 1)), max - 2);
8784
assert_eq!((max - 3).average_floor(&(max - 2)), max - 3);
8885
}

‎tests/roots.rs‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
extern crate num_integer;
2-
extern crate num_traits;
3-
41
use num_integer::Roots;
52
use num_traits::checked_pow;
63
use num_traits::{AsPrimitive, PrimInt, Signed};
@@ -161,10 +158,10 @@ where
161158
macro_rules! test_roots {
162159
($I:ident, $U:ident) => {
163160
mod $I {
164-
use check;
165-
use neg;
161+
use crate::check;
162+
use crate::neg;
163+
use crate::pos;
166164
use num_integer::Roots;
167-
use pos;
168165
use std::mem;
169166

170167
#[test]
@@ -223,9 +220,9 @@ macro_rules! test_roots {
223220
}
224221

225222
mod $U {
226-
use check;
223+
use crate::check;
224+
use crate::pos;
227225
use num_integer::Roots;
228-
use pos;
229226
use std::mem;
230227

231228
#[test]

0 commit comments

Comments
 (0)