Merge #186

186: Merge master changes into breaking r=Dylan-DPC a=kinggoesgaming Supersedes #164
uuid-rs · Mar 27, 2018 · 36b7edf · 36b7edf
2 parents a9b5afb + de081d7
commit 36b7edf
Show file tree

Hide file tree

Showing 8 changed files with 306 additions and 166 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -28,11 +28,14 @@ matrix:
         - travis-cargo --only nightly doc-upload
 
     - rust: nightly
+      cache: cargo
       before_script:
         - rustup component add rustfmt-preview
+#        - ( cargo install clippy || true )
       script:
         - cargo fmt --all -- --write-mode=diff
-        - cargo test  
+        - cargo test
+#        - cargo clippy
 
 script:
   - cargo test --features "$FEATURES" $NDF

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "uuid"
-version = "0.6.1"
+version = "0.6.2"
 authors = [
         "Ashley Mannix<ashleymannix@live.com.au>",
         "Christopher Armstrong",
@@ -26,6 +26,7 @@ rand = { version = "0.4", optional = true }
 sha1 = { version = "0.6", optional = true }
 md5 = { version = "0.3", optional = true }
 slog = { version = "2", optional = true }
+cfg-if = "0.1"
 
 [dev-dependencies]
 serde_test = "1.0.19"