From 78c04a254e869748687117170091f92384154825 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 22 May 2020 17:29:42 +0200 Subject: [PATCH] refactor ~ rename MinSRV => MinRustV --- .github/workflows/CICD.yml | 2 +- Cargo.toml | 8 ++++---- src/uu/od/Cargo.toml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml index aacd4d51c..2e4777796 100644 --- a/.github/workflows/CICD.yml +++ b/.github/workflows/CICD.yml @@ -68,7 +68,7 @@ jobs: S=$(cargo clippy ${{ matrix.job.cargo-options }} ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} -- -D warnings 2>&1) && printf "%s\n" "$S" || { printf "%s\n" "$S" ; printf "%s" "$S" | sed -E -n -e '/^error:/{' -e "N; s/^error:[[:space:]]+(.*)\\n[[:space:]]+-->[[:space:]]+(.*):([0-9]+):([0-9]+).*$/::warning file=\2,line=\3,col=\4::WARNING: \`cargo clippy\`: \1/p;" -e '}' ; } min_version: - name: MinSRV # Minimum supported rust version + name: MinRustV # Minimum supported rust version runs-on: ${{ matrix.job.os }} strategy: matrix: diff --git a/Cargo.toml b/Cargo.toml index fe2bf62d0..c5cc67f89 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -324,10 +324,10 @@ whoami = { optional=true, version="0.0.1", package="uu_whoami", path="src/uu/w yes = { optional=true, version="0.0.1", package="uu_yes", path="src/uu/yes" } # # * pinned transitive dependencies -pin_backtrace = { version=">= 0.3.3, <= 0.3.30", package="backtrace" } ## via 'failure'; pin to <= v0.3.30 to avoid increasing MinSRV to v1.33.0 -pin_half = { version="1.1.0, < 1.4.0", package="half" } ## half v1.4.0 has compiler errors for MinSRV v1.31.0 -pin_same-file = { version="1.0.4, < 1.0.6", package="same-file" } ## same-file v1.0.6 has compiler errors for MinSRV v1.31.0 -pin_winapi-util = { version="0.1.2, < 0.1.3", package="winapi-util" } ## winapi-util v0.1.3 has compiler errors for MinSRV v1.31.0 +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 +pin_half = { version="1.1.0, < 1.4.0", package="half" } ## half v1.4.0 has compiler errors for MinRustV v1.31.0 +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 +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 [dev-dependencies] filetime = "0.2" diff --git a/src/uu/od/Cargo.toml b/src/uu/od/Cargo.toml index 378720da4..c5a53c1b4 100644 --- a/src/uu/od/Cargo.toml +++ b/src/uu/od/Cargo.toml @@ -17,7 +17,7 @@ path = "src/od.rs" [dependencies] byteorder = "1.3.2" getopts = "0.2.18" -half = { version="1.1.0, < 1.4.0", package="half" } ## half v1.4.0 has compiler errors for MinSRV v1.31.0 +half = { version="1.1.0, < 1.4.0", package="half" } ## half v1.4.0 has compiler errors for MinRustV v1.31.0 libc = "0.2.42" uucore = { version="0.0.4", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary" } uucore_procs = { version="0.0.4", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }