Skip to content

Commit 1f59ef7

Browse files
committed
Prepare for Rust 2018
1 parent 631d344 commit 1f59ef7

File tree

4 files changed

+17
-15
lines changed

4 files changed

+17
-15
lines changed

src/functional.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
55
use super::ArrayLength;
66
use core::iter::FromIterator;
7-
use sequence::*;
7+
8+
use ::sequence::*;
89

910
/// Defines the relationship between one generic sequence and another,
1011
/// for operations such as `map` and `zip`.

src/hex.rs

+6-7
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@
1515
//! ```
1616
//!
1717
18-
use core::cmp::min;
19-
use core::fmt;
20-
use core::ops::Add;
21-
use core::str;
18+
use core::{fmt, str, ops::Add, cmp::min};
19+
2220
use typenum::*;
23-
use {ArrayLength, GenericArray};
21+
22+
use ::{ArrayLength, GenericArray};
2423

2524
static LOWER_CHARS: &'static [u8] = b"0123456789abcdef";
2625
static UPPER_CHARS: &'static [u8] = b"0123456789ABCDEF";
@@ -30,7 +29,7 @@ where
3029
T: Add<T>,
3130
<T as Add<T>>::Output: ArrayLength<u8>,
3231
{
33-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
32+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
3433
let max_digits = f.precision().unwrap_or_else(|| self.len() * 2);
3534
let max_hex = (max_digits >> 1) + (max_digits & 1);
3635

@@ -70,7 +69,7 @@ where
7069
T: Add<T>,
7170
<T as Add<T>>::Output: ArrayLength<u8>,
7271
{
73-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
72+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
7473
let max_digits = f.precision().unwrap_or_else(|| self.len() * 2);
7574
let max_hex = (max_digits >> 1) + (max_digits & 1);
7675

src/impls.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
use super::{ArrayLength, GenericArray};
21
use core::borrow::{Borrow, BorrowMut};
32
use core::cmp::Ordering;
43
use core::fmt::{self, Debug};
54
use core::hash::{Hash, Hasher};
6-
use functional::*;
7-
use sequence::*;
5+
6+
use super::{ArrayLength, GenericArray};
7+
8+
use ::functional::*;
9+
use ::sequence::*;
810

911
impl<T: Default, N> Default for GenericArray<T, N>
1012
where

src/lib.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ pub mod functional;
6767
pub mod iter;
6868
pub mod sequence;
6969

70-
use functional::*;
71-
pub use iter::GenericArrayIter;
72-
use sequence::*;
70+
use self::functional::*;
71+
pub use self::iter::GenericArrayIter;
72+
use self::sequence::*;
7373

7474
/// Trait making `GenericArray` work, marking types to be used as length of an array
7575
pub unsafe trait ArrayLength<T>: Unsigned {
@@ -616,7 +616,7 @@ mod test {
616616

617617
#[test]
618618
fn test_assembly() {
619-
use functional::*;
619+
use ::functional::*;
620620

621621
let a = black_box(arr![i32; 1, 3, 5, 7]);
622622
let b = black_box(arr![i32; 2, 4, 6, 8]);

0 commit comments

Comments
 (0)