Skip to content

Commit 521acc8

Browse files
leo60228leo60228
committed
Revert to Rust 2015 (oops)
1 parent dd041c0 commit 521acc8

14 files changed

+73
-46
lines changed

‎.travis.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,28 @@ matrix:
88
# (we only use it in benchmarks anyway...)
99
- cargo generate-lockfile
1010
- cargo update -p lazy_static --precise 1.0.2
11+
env:
12+
- FEATURES='force_std'
1113
- rust: stable
1214
env:
1315
- FEATURES='serde-1'
16+
- TEST_FEATURES='force_std'
1417
- rust: beta
18+
env:
19+
- TEST_FEATURES='force_std'
1520
- rust: nightly
21+
env:
22+
- TEST_FEATURES='force_std'
1623
- rust: nightly
1724
env:
1825
- FEATURES='test_low_transition_point'
26+
- TEST_FEATURES='force_std'
1927
branches:
2028
only:
2129
- master
2230
script:
2331
- |
2432
cargo build --verbose --features "$FEATURES" &&
25-
cargo test --verbose --features "$FEATURES",force_std &&
26-
cargo test --release --verbose --features "$FEATURES",force_std &&
33+
cargo test --verbose --features "$FEATURES $TEST_FEATURES" &&
34+
cargo test --release --verbose --features "$FEATURES $TEST_FEATURES" &&
2735
cargo doc --verbose --features "$FEATURES"

‎Cargo.toml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "indexmap"
33
version = "1.1.0"
4-
edition = "2018"
54
authors = [
65
"bluss",
76
"Josh Stone <[email protected]>"
@@ -35,11 +34,10 @@ features = ["serde-1"]
3534
bench = false
3635

3736
[dependencies]
38-
serde = { version = "1.0", optional = true, default-features = false }
39-
hashbrown = "0.6.0"
37+
serde = { version = "1.0", optional = true }
4038

4139
[dev-dependencies]
42-
itertools = "0.8.0"
40+
itertools = "0.7.0"
4341
rand = "0.4"
4442
quickcheck = { version = "0.6", default-features = false }
4543
fnv = "1.0"
@@ -84,4 +82,4 @@ required-features = [ "force_std" ]
8482

8583
[[bench]]
8684
name = "faststring"
87-
required-features = [ "force_std" ]
85+
required-features = [ "force_std" ]

‎benches/bench.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#![feature(test)]
22
extern crate test;
3+
extern crate rand;
4+
extern crate fnv;
35
#[macro_use]
46
extern crate lazy_static;
57

@@ -11,6 +13,8 @@ type FnvBuilder = BuildHasherDefault<FnvHasher>;
1113
use test::Bencher;
1214
use test::black_box;
1315

16+
extern crate indexmap;
17+
1418
use indexmap::IndexMap;
1519

1620
use std::collections::HashMap;

‎benches/faststring.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
#![feature(test)]
22
extern crate test;
3+
extern crate rand;
4+
extern crate lazy_static;
35

46
use test::Bencher;
57

8+
extern crate indexmap;
9+
610
use indexmap::IndexMap;
711

812
use std::collections::HashMap;

‎build.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1+
extern crate autocfg;
2+
13
fn main() {
2-
let ac = autocfg::new();
3-
ac.emit_has_path("std");
4-
ac.emit_has_path("alloc");
5-
}
4+
//let ac = autocfg::new();
5+
//ac.emit_sysroot_crate("std");
6+
//ac.emit_sysroot_crate("alloc");
7+
autocfg::emit("std");
8+
//autocfg::emit("alloc");
9+
}

‎src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
2323
#![cfg_attr(all(not(test), has_alloc, not(feature = "force_std")), no_std)]
2424

25-
#[cfg(test)]
2625
extern crate core;
2726

2827
#[cfg(all(has_alloc, not(feature = "force_std")))]

‎src/macros.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
/// ## Example
55
///
66
/// ```
7-
/// # extern crate std;
87
///
98
/// #[macro_use] extern crate indexmap;
109
/// # fn main() {
@@ -45,7 +44,6 @@ macro_rules! indexmap {
4544
/// ## Example
4645
///
4746
/// ```
48-
/// # extern crate std;
4947
/// #[macro_use] extern crate indexmap;
5048
/// # fn main() {
5149
///

‎src/map.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! `IndexMap` is a hash table where the iteration order of the key-value
22
//! pairs is independent of the hash values of the keys.
33
4-
pub use crate::mutable_keys::MutableKeys;
4+
pub use mutable_keys::MutableKeys;
55

66
use core::hash::Hash;
77
use core::hash::BuildHasher;
@@ -18,9 +18,9 @@ use alloc::vec::Vec;
1818
use alloc::boxed::Box;
1919
use alloc::vec;
2020

21-
use crate::util::{third, ptrdistance, enumerate};
22-
use crate::equivalent::Equivalent;
23-
use crate::{
21+
use util::{third, ptrdistance, enumerate};
22+
use equivalent::Equivalent;
23+
use {
2424
Bucket,
2525
HashValue,
2626
};
@@ -249,7 +249,7 @@ impl<Sz> ShortHashProxy<Sz>
249249
/// # Examples
250250
///
251251
/// ```
252-
/// # extern crate std;
252+
/// # extern crate indexmap;
253253
/// use indexmap::IndexMap;
254254
///
255255
/// // count the frequency of each letter in a sentence.
@@ -313,28 +313,28 @@ impl<K, V, S> fmt::Debug for IndexMap<K, V, S>
313313
S: BuildHasher,
314314
{
315315
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
316-
f.debug_map().entries(self.iter()).finish()?;
316+
try!(f.debug_map().entries(self.iter()).finish());
317317
if cfg!(not(feature = "test_debug")) {
318318
return Ok(());
319319
}
320-
writeln!(f, "")?;
320+
try!(writeln!(f, ""));
321321
for (i, index) in enumerate(&*self.core.indices) {
322-
write!(f, "{}: {:?}", i, index)?;
322+
try!(write!(f, "{}: {:?}", i, index));
323323
if let Some(pos) = index.pos() {
324324
let hash = self.core.entries[pos].hash;
325325
let key = &self.core.entries[pos].key;
326326
let desire = desired_pos(self.core.mask, hash);
327-
write!(f, ", desired={}, probe_distance={}, key={:?}",
327+
try!(write!(f, ", desired={}, probe_distance={}, key={:?}",
328328
desire,
329329
probe_distance(self.core.mask, hash, i),
330-
key)?;
330+
key));
331331
}
332-
writeln!(f, "")?;
332+
try!(writeln!(f, ""));
333333
}
334-
writeln!(f, "cap={}, raw_cap={}, entries.cap={}",
334+
try!(writeln!(f, "cap={}, raw_cap={}, entries.cap={}",
335335
self.capacity(),
336336
self.raw_capacity(),
337-
self.core.entries.capacity())?;
337+
self.core.entries.capacity()));
338338
Ok(())
339339
}
340340
}
@@ -1913,7 +1913,7 @@ impl<K, V, S> Eq for IndexMap<K, V, S>
19131913
#[cfg(test)]
19141914
mod tests {
19151915
use super::*;
1916-
use crate::util::enumerate;
1916+
use util::enumerate;
19171917

19181918
#[test]
19191919
fn it_works() {

‎src/serde.rs

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11

2-
use serde::ser::{Serialize, Serializer, SerializeMap, SerializeSeq};
3-
use serde::de::{Deserialize, Deserializer, Error, IntoDeserializer, MapAccess, SeqAccess, Visitor};
4-
use serde::de::value::{MapDeserializer, SeqDeserializer};
2+
extern crate serde;
53

6-
use core::fmt::{self, Formatter};
7-
use core::hash::{BuildHasher, Hash};
8-
use core::marker::PhantomData;
4+
use self::serde::ser::{Serialize, Serializer, SerializeMap, SerializeSeq};
5+
use self::serde::de::{Deserialize, Deserializer, Error, IntoDeserializer, MapAccess, SeqAccess, Visitor};
6+
use self::serde::de::value::{MapDeserializer, SeqDeserializer};
97

10-
use crate::IndexMap;
8+
use std::fmt::{self, Formatter};
9+
use std::hash::{BuildHasher, Hash};
10+
use std::marker::PhantomData;
11+
12+
use IndexMap;
1113

1214
/// Requires crate feature `"serde-1"`
1315
impl<K, V, S> Serialize for IndexMap<K, V, S>
@@ -18,9 +20,9 @@ impl<K, V, S> Serialize for IndexMap<K, V, S>
1820
fn serialize<T>(&self, serializer: T) -> Result<T::Ok, T::Error>
1921
where T: Serializer
2022
{
21-
let mut map_serializer = serializer.serialize_map(Some(self.len()))?;
23+
let mut map_serializer = try!(serializer.serialize_map(Some(self.len())));
2224
for (key, value) in self {
23-
map_serializer.serialize_entry(key, value)?;
25+
try!(map_serializer.serialize_entry(key, value));
2426
}
2527
map_serializer.end()
2628
}
@@ -44,7 +46,7 @@ impl<'de, K, V, S> Visitor<'de> for OrderMapVisitor<K, V, S>
4446
{
4547
let mut values = IndexMap::with_capacity_and_hasher(map.size_hint().unwrap_or(0), S::default());
4648

47-
while let Some((key, value)) = map.next_entry()? {
49+
while let Some((key, value)) = try!(map.next_entry()) {
4850
values.insert(key, value);
4951
}
5052

@@ -79,7 +81,7 @@ impl<'de, K, V, S, E> IntoDeserializer<'de, E> for IndexMap<K, V, S>
7981
}
8082

8183

82-
use crate::IndexSet;
84+
use IndexSet;
8385

8486
/// Requires crate feature `"serde-1"`
8587
impl<T, S> Serialize for IndexSet<T, S>
@@ -89,9 +91,9 @@ impl<T, S> Serialize for IndexSet<T, S>
8991
fn serialize<Se>(&self, serializer: Se) -> Result<Se::Ok, Se::Error>
9092
where Se: Serializer
9193
{
92-
let mut set_serializer = serializer.serialize_seq(Some(self.len()))?;
94+
let mut set_serializer = try!(serializer.serialize_seq(Some(self.len())));
9395
for value in self {
94-
set_serializer.serialize_element(value)?;
96+
try!(set_serializer.serialize_element(value));
9597
}
9698
set_serializer.end()
9799
}
@@ -114,7 +116,7 @@ impl<'de, T, S> Visitor<'de> for OrderSetVisitor<T, S>
114116
{
115117
let mut values = IndexSet::with_capacity_and_hasher(seq.size_hint().unwrap_or(0), S::default());
116118

117-
while let Some(value) = seq.next_element()? {
119+
while let Some(value) = try!(seq.next_element()) {
118120
values.insert(value);
119121
}
120122

‎src/set.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ type Bucket<T> = super::Bucket<T, ()>;
4444
/// # Examples
4545
///
4646
/// ```
47-
/// # extern crate std;
47+
/// # extern crate indexmap;
4848
/// use indexmap::IndexSet;
4949
///
5050
/// // Collects which letters appear in a sentence.
@@ -950,7 +950,7 @@ impl<'a, 'b, T, S1, S2> Sub<&'b IndexSet<T, S2>> for &'a IndexSet<T, S1>
950950
#[cfg(test)]
951951
mod tests {
952952
use super::*;
953-
use crate::util::enumerate;
953+
use util::enumerate;
954954

955955
#[test]
956956
fn it_works() {

‎tests/equivalent_trait.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
#[macro_use] extern crate indexmap;
23

34
use indexmap::Equivalent;

‎tests/quick.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1+
2+
extern crate indexmap;
3+
extern crate itertools;
14
#[macro_use]
25
extern crate quickcheck;
36

7+
extern crate fnv;
8+
49
use indexmap::IndexMap;
510
use itertools::Itertools;
611

@@ -332,7 +337,7 @@ impl Arbitrary for Alpha {
332337
}).collect())
333338
}
334339

335-
fn shrink(&self) -> Box<dyn Iterator<Item=Self>> {
340+
fn shrink(&self) -> Box<Iterator<Item=Self>> {
336341
Box::new((**self).shrink().map(Alpha))
337342
}
338343
}
@@ -354,7 +359,7 @@ impl<T> Arbitrary for Large<Vec<T>>
354359
Large((0..len).map(|_| T::arbitrary(g)).collect())
355360
}
356361

357-
fn shrink(&self) -> Box<dyn Iterator<Item=Self>> {
362+
fn shrink(&self) -> Box<Iterator<Item=Self>> {
358363
Box::new((**self).shrink().map(Large))
359364
}
360365
}

‎tests/serde.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
#[macro_use]
44
extern crate indexmap;
5+
extern crate serde_test;
6+
extern crate fnv;
57

68
use serde_test::{Token, assert_tokens};
79

‎tests/tests.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
12
#[macro_use]
23
extern crate indexmap;
4+
extern crate itertools;
35

46

57
#[test]

0 commit comments

Comments
 (0)