Skip to content

Commit 3339657

Browse files
committed
cargo fix --edition
1 parent c42e9de commit 3339657

File tree

9 files changed

+29
-29
lines changed

9 files changed

+29
-29
lines changed

src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ pub mod set;
110110
#[cfg(feature = "rayon")]
111111
mod rayon;
112112

113-
pub use equivalent::Equivalent;
114-
pub use map::IndexMap;
115-
pub use set::IndexSet;
113+
pub use crate::equivalent::Equivalent;
114+
pub use crate::map::IndexMap;
115+
pub use crate::set::IndexSet;
116116

117117
// shared private items
118118

src/map.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@
33
44
mod core;
55

6-
pub use mutable_keys::MutableKeys;
6+
pub use crate::mutable_keys::MutableKeys;
77

88
#[cfg(feature = "rayon")]
9-
pub use rayon::map as rayon;
9+
pub use crate::rayon::map as rayon;
1010

11+
use crate::vec::{self, Vec};
1112
use core::cmp::Ordering;
1213
use core::fmt;
1314
use core::hash::{BuildHasher, Hash, Hasher};
1415
use core::iter::FromIterator;
1516
use core::ops::{Index, IndexMut, RangeFull};
1617
use core::slice::{Iter as SliceIter, IterMut as SliceIterMut};
17-
use vec::{self, Vec};
1818

1919
#[cfg(has_std)]
2020
use std::collections::hash_map::RandomState;
2121

2222
use self::core::IndexMapCore;
23-
use equivalent::Equivalent;
24-
use util::third;
25-
use {Bucket, Entries, HashValue};
23+
use crate::equivalent::Equivalent;
24+
use crate::util::third;
25+
use crate::{Bucket, Entries, HashValue};
2626

2727
pub use self::core::{Entry, OccupiedEntry, VacantEntry};
2828

@@ -1139,8 +1139,8 @@ where
11391139
#[cfg(test)]
11401140
mod tests {
11411141
use super::*;
1142+
use crate::util::enumerate;
11421143
use std::string::String;
1143-
use util::enumerate;
11441144

11451145
#[test]
11461146
fn it_works() {

src/map/core.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ mod raw;
1111

1212
use hashbrown::raw::RawTable;
1313

14+
use crate::vec::{Drain, Vec};
1415
use core::cmp;
1516
use core::fmt;
1617
use core::mem::replace;
1718
use core::ops::RangeFull;
18-
use vec::{Drain, Vec};
1919

20-
use equivalent::Equivalent;
21-
use util::enumerate;
22-
use {Bucket, Entries, HashValue};
20+
use crate::equivalent::Equivalent;
21+
use crate::util::enumerate;
22+
use crate::{Bucket, Entries, HashValue};
2323

2424
/// Core of the map that does not depend on S
2525
pub(crate) struct IndexMapCore<K, V> {

src/rayon/map.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ use super::collect;
99
use super::rayon::iter::plumbing::{Consumer, ProducerCallback, UnindexedConsumer};
1010
use super::rayon::prelude::*;
1111

12+
use crate::vec::Vec;
1213
use core::cmp::Ordering;
1314
use core::fmt;
1415
use core::hash::{BuildHasher, Hash};
15-
use vec::Vec;
1616

17-
use Bucket;
18-
use Entries;
19-
use IndexMap;
17+
use crate::Bucket;
18+
use crate::Entries;
19+
use crate::IndexMap;
2020

2121
/// Requires crate feature `"rayon"`.
2222
impl<K, V, S> IntoParallelIterator for IndexMap<K, V, S>

src/rayon/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use alloc::collections::LinkedList;
88
#[cfg(has_std)]
99
use std::collections::LinkedList;
1010

11-
use vec::Vec;
11+
use crate::vec::Vec;
1212

1313
// generate `ParallelIterator` methods by just forwarding to the underlying
1414
// self.entries and mapping its elements.

src/rayon/set.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ use super::collect;
99
use super::rayon::iter::plumbing::{Consumer, ProducerCallback, UnindexedConsumer};
1010
use super::rayon::prelude::*;
1111

12+
use crate::vec::Vec;
1213
use core::cmp::Ordering;
1314
use core::fmt;
1415
use core::hash::{BuildHasher, Hash};
15-
use vec::Vec;
1616

17-
use Entries;
18-
use IndexSet;
17+
use crate::Entries;
18+
use crate::IndexSet;
1919

20-
type Bucket<T> = ::Bucket<T, ()>;
20+
type Bucket<T> = crate::Bucket<T, ()>;
2121

2222
/// Requires crate feature `"rayon"`.
2323
impl<T, S> IntoParallelIterator for IndexSet<T, S>

src/serde.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use core::fmt::{self, Formatter};
1010
use core::hash::{BuildHasher, Hash};
1111
use core::marker::PhantomData;
1212

13-
use IndexMap;
13+
use crate::IndexMap;
1414

1515
/// Requires crate feature `"serde-1"`
1616
impl<K, V, S> Serialize for IndexMap<K, V, S>
@@ -89,7 +89,7 @@ where
8989
}
9090
}
9191

92-
use IndexSet;
92+
use crate::IndexSet;
9393

9494
/// Requires crate feature `"serde-1"`
9595
impl<T, S> Serialize for IndexSet<T, S>

src/set.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
//! A hash set implemented using `IndexMap`
22
33
#[cfg(feature = "rayon")]
4-
pub use rayon::set as rayon;
4+
pub use crate::rayon::set as rayon;
55

66
#[cfg(has_std)]
77
use std::collections::hash_map::RandomState;
88

9+
use crate::vec::{self, Vec};
910
use core::cmp::Ordering;
1011
use core::fmt;
1112
use core::hash::{BuildHasher, Hash};
1213
use core::iter::{Chain, FromIterator};
1314
use core::ops::{BitAnd, BitOr, BitXor, RangeFull, Sub};
1415
use core::slice;
15-
use vec::{self, Vec};
1616

1717
use super::{Entries, Equivalent, IndexMap};
1818

@@ -1159,8 +1159,8 @@ where
11591159
#[cfg(test)]
11601160
mod tests {
11611161
use super::*;
1162+
use crate::util::enumerate;
11621163
use std::string::String;
1163-
use util::enumerate;
11641164

11651165
#[test]
11661166
fn it_works() {

tests/quick.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ quickcheck! {
144144

145145
}
146146

147-
use Op::*;
147+
use crate::Op::*;
148148
#[derive(Copy, Clone, Debug)]
149149
enum Op<K, V> {
150150
Add(K, V),

0 commit comments

Comments
 (0)