Merge branch 'master' into merge.uucore

This commit is contained in:
Sylvestre Ledru 2020-11-14 17:08:59 +01:00 committed by Roy Ivy III
commit 91559698d0

View file

@ -324,7 +324,7 @@ 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" } yes = { optional=true, version="0.0.1", package="uu_yes", path="src/uu/yes" }
# #
# * pinned transitive dependencies # * pinned transitive dependencies
pin_cc = { version="1.0.0, < 1.0.62", package="cc" } ## cc v1.0.62 has compiler errors for MinRustV v1.32.0, needs 1.34 (for `std::str::split_ascii_whitespace()`) pin_cc = { version="1.0.61, < 1.0.62", package="cc" } ## cc v1.0.62 has compiler errors for MinRustV v1.32.0, requires 1.34 (for `std::str::split_ascii_whitespace()`)
pin_rustc-demangle = { version="0.1.16, < 0.1.17", package="rustc-demangle" } ## rust-demangle v0.1.17 has compiler errors for MinRustV v1.32.0, expects 1.33 pin_rustc-demangle = { version="0.1.16, < 0.1.17", package="rustc-demangle" } ## rust-demangle v0.1.17 has compiler errors for MinRustV v1.32.0, expects 1.33
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 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
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 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