Skip to content

Commit 5926315

Browse files
committed
bump the minimal version of rustc to 1.32
1 parent 358af09 commit 5926315

File tree

9 files changed

+85
-35
lines changed

9 files changed

+85
-35
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ environment:
2626

2727
matrix:
2828
# minimum version
29-
- CHANNEL: 1.31.0
29+
- CHANNEL: 1.32.0
3030
ARCH: i686
3131
ABI: msvc
3232
# # "msvc" ABI

.github/workflows/CICD.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ env:
1111
PROJECT_NAME: coreutils
1212
PROJECT_DESC: "Core universal (cross-platform) utilities"
1313
PROJECT_AUTH: "uutils"
14-
RUST_MIN_SRV: "1.31.0" ## v1.31.0 == "Rust 2018" (2018-12-06)
14+
RUST_MIN_SRV: "1.32.0" ## v1.32.0 - minimum version for half, tempfile, etc
1515
RUST_COV_SRV: "2020-04-29" ## (~v1.45.0) supported rust version for code coverage; (date required/used by 'coverage') ## !maint: refactor when code coverage support is included in the stable channel
1616

1717
on: [push, pull_request]

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ matrix:
1818
- rust: nightly
1919
fast_finish: true
2020
include:
21-
- rust: 1.31.0
21+
- rust: 1.32.0
2222
env: FEATURES=unix
2323
# - rust: stable
2424
# os: linux

Cargo.lock

Lines changed: 74 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -324,10 +324,8 @@ whoami = { optional=true, version="0.0.1", package="uu_whoami", path="src/uu/w
324324
yes = { optional=true, version="0.0.1", package="uu_yes", path="src/uu/yes" }
325325
#
326326
# * pinned transitive dependencies
327-
pin_backtrace = { version=">= 0.3.3, <= 0.3.30", package="backtrace" } ## via 'failure'; pin to <= v0.3.30 to avoid increasing MinRustV to v1.33.0
328-
pin_half = { version="1.1.0, < 1.4.0", package="half" } ## half v1.4.0 has compiler errors for MinRustV v1.31.0
329-
pin_same-file = { version="1.0.4, < 1.0.6", package="same-file" } ## same-file v1.0.6 has compiler errors for MinRustV v1.31.0
330-
pin_winapi-util = { version="0.1.2, < 0.1.3", package="winapi-util" } ## winapi-util v0.1.3 has compiler errors for MinRustV v1.31.0
327+
pin_same-file = { version="1.0.4, < 1.0.6", package="same-file" } ## same-file v1.0.6 has compiler errors for MinRustV v1.32.0, expects 1.34
328+
pin_winapi-util = { version="0.1.2, < 0.1.3", package="winapi-util" } ## winapi-util v0.1.3 has compiler errors for MinRustV v1.32.0, expects 1.34
331329

332330
[dev-dependencies]
333331
filetime = "0.2"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Requirements
4040
### Rust Version ###
4141

4242
uutils follows Rust's release channels and is tested against stable, beta and nightly.
43-
The current oldest supported version of the Rust compiler is `1.31.0`.
43+
The current oldest supported version of the Rust compiler is `1.32.0`.
4444

4545
On both Windows and Redox, only the nightly version is tested currently.
4646

src/uu/mktemp/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ path = "src/mktemp.rs"
1717
[dependencies]
1818
getopts = "0.2.18"
1919
rand = "0.5"
20-
tempfile = "2.1.5"
20+
tempfile = "3.0"
2121
uucore = { version="0.0.4", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary" }
2222
uucore_procs = { version="0.0.4", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
2323

src/uu/mktemp/src/mktemp.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use std::mem::forget;
2121
use std::path::{is_separator, PathBuf};
2222

2323
use rand::Rng;
24-
use tempfile::NamedTempFileOptions;
24+
use tempfile::Builder;
2525

2626
mod tempdir;
2727

@@ -213,11 +213,10 @@ fn exec(
213213
}
214214
}
215215

216-
let tmpfile = NamedTempFileOptions::new()
217-
.prefix(prefix)
216+
let tmpfile = Builder::new()
218217
.rand_bytes(rand)
219218
.suffix(suffix)
220-
.create_in(tmpdir);
219+
.tempfile_in(tmpdir);
221220

222221
let tmpfile = match tmpfile {
223222
Ok(f) => f,

src/uu/od/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ path = "src/od.rs"
1717
[dependencies]
1818
byteorder = "1.3.2"
1919
getopts = "0.2.18"
20-
half = { version="1.1.0, < 1.4.0", package="half" } ## half v1.4.0 has compiler errors for MinRustV v1.31.0
20+
half = "1.6"
2121
libc = "0.2.42"
2222
uucore = { version="0.0.4", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary" }
2323
uucore_procs = { version="0.0.4", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }

0 commit comments

Comments
 (0)