Merge pull request #34 from ArazAbishov/edition-2018

Edition 2018
arazabishov · Sep 17, 2019 · f6fb618 · f6fb618
2 parents eb23621 + 69258ef
commit f6fb618
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 30 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,10 @@
 language: rust
 
 rust:
-  - nightly
+  - stable
 
 before_script:
-  - rustup toolchain install nightly-2019-08-09
-  - rustup component add --toolchain nightly-2019-08-09 rustfmt-preview
-  - rustup default nightly-2019-08-09
+  - rustup component add rustfmt  
 
 script:
   - cargo fmt --all -- --check

diff --git a/Cargo.toml b/Cargo.toml
@@ -5,6 +5,8 @@ members = ["pvec-core", "pvec-utils"]
 name = "pvec"
 version = "0.2.0"
 authors = ["Araz Abishov <araz@abishov.com>"]
+autobenches = false
+edition = "2018"
 
 [dependencies]
 pvec-core = { version = "0.1.0", path = "pvec-core" }

diff --git a/benches/lib.rs b/benches/lib.rs
@@ -1,5 +1,3 @@
-#![cfg_attr(test, feature(test))]
-
 extern crate criterion;
 
 #[cfg(feature = "arc")]
@@ -11,7 +9,6 @@ extern crate num;
 extern crate pvec;
 extern crate rand;
 extern crate rand_xorshift;
-extern crate test as test_crate;
 
 #[cfg(all(feature = "arc", feature = "rayon-iter"))]
 extern crate rayon;

diff --git a/benches/life.rs b/benches/life.rs
@@ -167,7 +167,7 @@ mod stdvec {
 
 mod rrbvec {
     use super::*;
-    use pvec::core::RrbVec;
+    use crate::pvec::core::RrbVec;
 
     #[derive(PartialEq, Eq, Clone, Debug)]
     pub struct Board {
@@ -356,7 +356,7 @@ mod rrbvec {
 
 mod pvec {
     use super::*;
-    use pvec::PVec;
+    use crate::pvec::PVec;
 
     #[derive(PartialEq, Eq, Clone, Debug)]
     pub struct Board {

diff --git a/benches/pythagoras.rs b/benches/pythagoras.rs
@@ -67,8 +67,8 @@ mod stdvec {
 
 mod rrbvec {
     use super::*;
-    use pvec::core::iter::RrbVecParIter;
-    use pvec::core::RrbVec;
+    use crate::pvec::core::iter::RrbVecParIter;
+    use crate::pvec::core::RrbVec;
 
     /// Same as par_euclid, without using rayon.
     pub fn euclid() -> u32 {
@@ -144,8 +144,8 @@ mod rrbvec {
 
 mod pvec {
     use super::*;
-    use pvec::iter::PVecParIter;
-    use pvec::PVec;
+    use crate::pvec::iter::PVecParIter;
+    use crate::pvec::PVec;
 
     /// Same as par_euclid, without using rayon.
     pub fn euclid() -> u32 {
@@ -237,8 +237,8 @@ fn euclid_serial(criterion: &mut Criterion) {
 }
 
 fn euclid_faux_serial(criterion: &mut Criterion) {
-    use pvec::core::iter::RrbVecParIter;
-    use pvec::iter::PVecParIter;
+    use crate::pvec::core::iter::RrbVecParIter;
+    use crate::pvec::iter::PVecParIter;
 
     let mut group = criterion.benchmark_group("euclid_faux_serial");
     group.bench_function("std", |b| {
@@ -294,8 +294,8 @@ fn euclid_parallel_one(criterion: &mut Criterion) {
 }
 
 fn euclid_parallel_outer(criterion: &mut Criterion) {
-    use pvec::core::iter::RrbVecParIter;
-    use pvec::iter::PVecParIter;
+    use crate::pvec::core::iter::RrbVecParIter;
+    use crate::pvec::iter::PVecParIter;
 
     let mut group = criterion.benchmark_group("euclid_parallel_outer");
     group.bench_function("std", |b| {
@@ -317,8 +317,8 @@ fn euclid_parallel_outer(criterion: &mut Criterion) {
 }
 
 fn euclid_parallel_full(criterion: &mut Criterion) {
-    use pvec::core::iter::RrbVecParIter;
-    use pvec::iter::PVecParIter;
+    use crate::pvec::core::iter::RrbVecParIter;
+    use crate::pvec::iter::PVecParIter;
 
     let mut group = criterion.benchmark_group("euclid_parallel_full");
     group.bench_function("std", |b| {

diff --git a/pvec-core/Cargo.toml b/pvec-core/Cargo.toml
@@ -6,6 +6,7 @@
 name = "pvec-core"
 version = "0.1.0"
 authors = ["Araz Abishov <araz@abishov.com>"]
+edition = "2018"
 
 [dependencies]
 serde = { version = "1.0.73", features = ["rc"], optional = true}

diff --git a/pvec-core/src/iter.rs b/pvec-core/src/iter.rs
@@ -1,6 +1,6 @@
 use super::RrbVec;
-use rrbtree::iter::RrbTreeIter;
-use rrbtree::BRANCH_FACTOR;
+use crate::rrbtree::iter::RrbTreeIter;
+use crate::rrbtree::BRANCH_FACTOR;
 use std::fmt::Debug;
 
 #[cfg(all(feature = "arc", feature = "rayon-iter"))]

diff --git a/pvec-core/src/lib.rs b/pvec-core/src/lib.rs
@@ -1,5 +1,3 @@
-#![feature(nll)]
-
 #[macro_use]
 #[cfg(feature = "serde-serializer")]
 extern crate serde_json;

diff --git a/pvec-utils/Cargo.toml b/pvec-utils/Cargo.toml
@@ -2,6 +2,7 @@
 name = "pvec-utils"
 version = "0.1.0"
 authors = ["Araz Abishov <araz@abishov.com>"]
+edition = "2018"
 
 [features]
 arc = []
diff --git a/src/iter.rs b/src/iter.rs
@@ -9,10 +9,10 @@ pub const BRANCH_FACTOR: usize = 32;
 #[cfg(all(test, feature = "small_branch"))]
 pub const BRANCH_FACTOR: usize = 4;
 
-use core::iter::RrbVecIter;
-use core::RrbVec;
+use crate::core::iter::RrbVecIter;
+use crate::core::RrbVec;
+use crate::utils::sharedptr::Take;
 use std::vec::IntoIter as VecIter;
-use utils::sharedptr::Take;
 
 #[cfg(all(feature = "arc", feature = "rayon-iter"))]
 use rayon::iter::plumbing::{bridge, Consumer, Producer, ProducerCallback, UnindexedConsumer};

diff --git a/src/lib.rs b/src/lib.rs
@@ -1,5 +1,3 @@
-#![feature(nll)]
-
 pub extern crate pvec_core as core;
 extern crate pvec_utils as utils;
 
@@ -11,8 +9,8 @@ use std::ops;
 
 pub mod iter;
 
-use core::RrbVec;
-use utils::sharedptr::SharedPtr;
+use crate::core::RrbVec;
+use crate::utils::sharedptr::SharedPtr;
 
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 enum Flavor<T> {