Merge #188

188: Bump smallvec version to 1.0 r=Amanieu a=messense See servo/rust-smallvec#175 for changelog Co-authored-by: messense <[email protected]>
Amanieu · Nov 4, 2019 · 4558f65 · 4558f65
2 parents 99e7e46 + ffd5a97
commit 4558f65
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,8 +7,7 @@ env:
 
 matrix:
   include:
-    # can't run tests on 1.31.0 due to rand dev-dependency
-    - rust: 1.31.0
+    - rust: 1.36.0
       os: linux
       script:
         - cargo build --lib
@@ -17,7 +16,7 @@ matrix:
         - rustup target add wasm32-unknown-unknown
         - cargo build --lib --target wasm32-unknown-unknown
 
-    - rust: 1.32.0
+    - rust: 1.36.0
       os: linux
       script: &script
         - cargo build
@@ -61,7 +60,7 @@ matrix:
         - cargo run --release --bin rwlock -- 1 1 1 0 1 2
         - cd ..
 
-    - rust: 1.32.0
+    - rust: 1.36.0
       os: osx
       script: *script
 

diff --git a/README.md b/README.md
@@ -127,7 +127,7 @@ changes to the core API do not cause breaking changes for users of `parking_lot`
 
 ## Minimum Rust version
 
-The current minimum required Rust version is 1.31. Any change to this is
+The current minimum required Rust version is 1.36. Any change to this is
 considered a breaking change and will require a major version bump.
 
 ## License

diff --git a/appveyor.yml b/appveyor.yml
@@ -25,19 +25,19 @@ environment:
   - TARGET: x86_64-pc-windows-msvc
     MSYSTEM: MINGW64
     CPU: x86_64
-    TOOLCHAIN: 1.32.0
+    TOOLCHAIN: 1.36.0
   - TARGET: i686-pc-windows-msvc
     MSYSTEM: MINGW32
     CPU: i686
-    TOOLCHAIN: 1.32.0
+    TOOLCHAIN: 1.36.0
   - TARGET: x86_64-pc-windows-gnu
     MSYSTEM: MINGW64
     CPU: x86_64
-    TOOLCHAIN: 1.32.0
+    TOOLCHAIN: 1.36.0
   - TARGET: i686-pc-windows-gnu
     MSYSTEM: MINGW32
     CPU: i686
-    TOOLCHAIN: 1.32.0
+    TOOLCHAIN: 1.36.0
 
 install:
   - set PATH=C:\msys64\%MSYSTEM%\bin;c:\msys64\usr\bin;%PATH%

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2018"
 
 [dependencies]
 cfg-if = "0.1.5"
-smallvec = "0.6"
+smallvec = "1.0"
 petgraph = { version = "0.4.5", optional = true }
 thread-id = { version = "3.2.0", optional = true }
 backtrace = { version = "0.3.2", optional = true }