Merge pull request #177 from tjkirch/upgrade-minimum

Update to Rust 2018, syn/quote/proc-macro2 1.0

.cirrus.yml

@@ -63,36 +63,17 @@ v1_34_test_task:
     - cargo test
   before_cache_script: rm -rf $CARGO_HOME/registry/index
 
-v1_30_test_task:
-  name: "Rust 1.30"
+v1_31_test_task:
+  name: "Rust 1.31"
   container:
-    image: rust:1.30
+    image: rust:1.31
     cpu: 1
     memory: 2Gi
   cargo_cache:
     folder: $CARGO_HOME/registry
     fingerprint_script: cat Cargo.toml
   primary_test_script:
-    - cd compatibility-tests/v1_30/
-    - rustc --version
-    - cargo test
-  before_cache_script: rm -rf $CARGO_HOME/registry/index
-
-v1_18_test_task:
-  name: "Rust 1.18"
-  container:
-    # No Docker container for 1.18
-    image: rust:latest
-    cpu: 1
-    memory: 2Gi
-  cargo_cache:
-    folder: $CARGO_HOME/registry
-    fingerprint_script: cat Cargo.toml
-  setup_script:
-    - rustup install 1.18.0
-    - rustup default 1.18.0
-  primary_test_script:
-    - cd compatibility-tests/v1_18/
+    - cd compatibility-tests/v1_31/
     - rustc --version
     - cargo test
   before_cache_script: rm -rf $CARGO_HOME/registry/index

Cargo.toml

@@ -2,6 +2,7 @@
 name = "snafu"
 version = "0.5.0"
 authors = ["Jake Goulding <jake.goulding@gmail.com>"]
+edition = "2018"
 
 readme = "README.md"
 description = "An ergonomic error handling library"
@@ -23,7 +24,7 @@ exclude = [
 all-features = true
 
 [features]
-default = ["rust_1_30", "backtraces"]
+default = ["backtraces"]
 
 # Adds the backtrace type
 backtraces = ["snafu-derive/backtraces", "backtrace"]
@@ -34,9 +35,6 @@ backtrace-crate = ["backtraces"]
 # Add extension traits for the futures 0.1 crate
 "futures-01" = ["futures01"]
 
-# New methods on `Error`; re-export of proc-macro
-rust_1_30 = ["snafu-derive/rust_1_30", "doc-comment"]
-
 # The standard library's implementation of futures
 "unstable-futures" = ["futures-core-preview", "pin-project"]
 
@@ -50,18 +48,17 @@ rust_1_30 = ["snafu-derive/rust_1_30", "doc-comment"]
 exclude = [
   "compatibility-tests/compile-fail",
   "compatibility-tests/v1_34",
-  "compatibility-tests/v1_30",
-  "compatibility-tests/v1_18",
+  "compatibility-tests/v1_31",
   "compatibility-tests/futures-0.1",
   "compatibility-tests/futures",
   "compatibility-tests/without-backtrace",
 ]
 
 [dependencies]
 snafu-derive = { path = "snafu-derive", version = "0.5.0" }
+doc-comment = { version = "0.3.1", default-features = false }
 backtrace = { version = "0.3.0", optional = true }
 futures01 = { version = "0.1", optional = true, default-features = false }
 futures-preview = { version = "0.3.0-alpha.16", optional = true, default-features = false }
 futures-core-preview = { version = "0.3.0-alpha.16", optional = true, default-features = false }
 pin-project = { version = "0.3.2", optional = true, default-features = false }
-doc-comment = { version = "0.3.1", optional = true, default-features = false }

compatibility-tests/v1_31/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "v1_31"
+version = "0.1.0"
+authors = ["Jake Goulding <jake.goulding@gmail.com>"]
+edition = "2018"
+
+[dependencies]
+snafu = { path = "../..", default-features = false, features = ["backtraces"] }
+
+# These versions are the last versions to support Rust 1.31
+backtrace = "= 0.3.35"

compatibility-tests/v1_31/rust-toolchain

@@ -0,0 +1 @@
+1.31.0

compatibility-tests/v1_31/src/lib.rs

@@ -0,0 +1 @@
+// There are not yet any feature differences that require testing for Rust 1.31 compatibility.

compatibility-tests/without-backtrace/Cargo.toml

@@ -5,4 +5,4 @@ authors = ["Jake Goulding <jake.goulding@gmail.com>"]
 edition = "2018"
 
 [dependencies]
-snafu = { path = "../..", default-features = false, features = ["rust_1_30"] }
+snafu = { path = "../..", default-features = false, features = [] }

snafu-derive/Cargo.toml

@@ -2,6 +2,7 @@
 name = "snafu-derive"
 version = "0.5.0"
 authors = ["Jake Goulding <jake.goulding@gmail.com>"]
+edition = "2018"
 
 description = "An ergonomic error handling library"
 documentation = "https://docs.rs/snafu"
@@ -11,12 +12,11 @@ license = "MIT OR Apache-2.0"
 
 [features]
 backtraces = []
-rust_1_30 = []
 
 [lib]
 proc-macro = true
 
 [dependencies]
-syn = { version = "0.15.19", features = ["full"] }
-quote = "0.6"
-proc-macro2 = "0.4"
+syn = { version = "1.0", features = ["full"] }
+quote = "1.0"
+proc-macro2 = "1.0"