Skip to content

Commit 4558f65

Browse files
bors[bot]messense
andauthored
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]>
2 parents 99e7e46 + ffd5a97 commit 4558f65

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

.travis.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ env:
77

88
matrix:
99
include:
10-
# can't run tests on 1.31.0 due to rand dev-dependency
11-
- rust: 1.31.0
10+
- rust: 1.36.0
1211
os: linux
1312
script:
1413
- cargo build --lib
@@ -17,7 +16,7 @@ matrix:
1716
- rustup target add wasm32-unknown-unknown
1817
- cargo build --lib --target wasm32-unknown-unknown
1918

20-
- rust: 1.32.0
19+
- rust: 1.36.0
2120
os: linux
2221
script: &script
2322
- cargo build
@@ -61,7 +60,7 @@ matrix:
6160
- cargo run --release --bin rwlock -- 1 1 1 0 1 2
6261
- cd ..
6362

64-
- rust: 1.32.0
63+
- rust: 1.36.0
6564
os: osx
6665
script: *script
6766

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ changes to the core API do not cause breaking changes for users of `parking_lot`
127127

128128
## Minimum Rust version
129129

130-
The current minimum required Rust version is 1.31. Any change to this is
130+
The current minimum required Rust version is 1.36. Any change to this is
131131
considered a breaking change and will require a major version bump.
132132

133133
## License

appveyor.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@ environment:
2525
- TARGET: x86_64-pc-windows-msvc
2626
MSYSTEM: MINGW64
2727
CPU: x86_64
28-
TOOLCHAIN: 1.32.0
28+
TOOLCHAIN: 1.36.0
2929
- TARGET: i686-pc-windows-msvc
3030
MSYSTEM: MINGW32
3131
CPU: i686
32-
TOOLCHAIN: 1.32.0
32+
TOOLCHAIN: 1.36.0
3333
- TARGET: x86_64-pc-windows-gnu
3434
MSYSTEM: MINGW64
3535
CPU: x86_64
36-
TOOLCHAIN: 1.32.0
36+
TOOLCHAIN: 1.36.0
3737
- TARGET: i686-pc-windows-gnu
3838
MSYSTEM: MINGW32
3939
CPU: i686
40-
TOOLCHAIN: 1.32.0
40+
TOOLCHAIN: 1.36.0
4141

4242
install:
4343
- set PATH=C:\msys64\%MSYSTEM%\bin;c:\msys64\usr\bin;%PATH%

core/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ edition = "2018"
1111

1212
[dependencies]
1313
cfg-if = "0.1.5"
14-
smallvec = "0.6"
14+
smallvec = "1.0"
1515
petgraph = { version = "0.4.5", optional = true }
1616
thread-id = { version = "3.2.0", optional = true }
1717
backtrace = { version = "0.3.2", optional = true }

0 commit comments

Comments
 (0)