From 22697169ab05be86a56e19c1c2e7891fdbc34216 Mon Sep 17 00:00:00 2001 From: messense Date: Mon, 4 Nov 2019 15:27:18 +0800 Subject: [PATCH 1/2] Bump smallvec version to 1.0 --- core/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Cargo.toml b/core/Cargo.toml index ed938175..b195cd9d 100644 --- 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 } From ffd5a97593190a525de451c5dc9c28c811c849ed Mon Sep 17 00:00:00 2001 From: messense Date: Mon, 4 Nov 2019 16:35:04 +0800 Subject: [PATCH 2/2] Bump minimum Rust version to 1.36 --- .travis.yml | 7 +++---- README.md | 2 +- appveyor.yml | 8 ++++---- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 09d800ab..200384da 100644 --- 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 index c3cbf895..c3cc73b8 100644 --- 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 index 734a8939..a7eb5cfc 100644 --- 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%