diff --git a/.travis.yml b/.travis.yml index 9a9c160c4..9b33568e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,12 +32,12 @@ matrix: # increased every 6 weeks or so when the first PR to use a new feature. - env: TARGET=x86_64-unknown-linux-gnu ALT=i686-unknown-linux-gnu - rust: 1.27.2 + rust: 1.28.0 script: - rustup toolchain install nightly - cargo +nightly generate-lockfile -Z minimal-versions - cargo -V - - cargo check --tests + - cargo test - env: TARGET=x86_64-unknown-linux-gnu ALT=i686-unknown-linux-gnu diff --git a/Cargo.toml b/Cargo.toml index a3bfbc240..b68c0fbda 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,8 +47,8 @@ semver = { version = "0.9.0", features = ["serde"] } serde = "1.0" serde_derive = "1.0" serde_ignored = "0.0.4" -serde_json = "1.0" -shell-escape = "0.1" +serde_json = "1.0.24" +shell-escape = "0.1.4" tar = { version = "0.4.15", default-features = false } tempfile = "3.0" termcolor = "1.0" diff --git a/appveyor.yml b/appveyor.yml index 170b7ca1d..c76612bba 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,6 +7,7 @@ environment: OTHER_TARGET: i686-pc-windows-msvc MAKE_TARGETS: test-unit-x86_64-pc-windows-msvc MINIMAL_VERSIONS: true + CFG_DISABLE_CROSS_TESTS: 1 install: - appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe @@ -23,5 +24,8 @@ clone_depth: 1 build: false test_script: + # we don't have ci time to run the full `cargo test` with `minimal-versions` like + # - if defined MINIMAL_VERSIONS cargo +nightly generate-lockfile -Z minimal-versions && cargo +stable test + # so we just run `cargo check --tests` like - if defined MINIMAL_VERSIONS cargo +nightly generate-lockfile -Z minimal-versions && cargo +stable check --tests - if NOT defined MINIMAL_VERSIONS cargo test diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs index 1f35f2d8d..6792ba12c 100644 --- a/src/cargo/lib.rs +++ b/src/cargo/lib.rs @@ -4,8 +4,8 @@ #![cfg_attr(feature = "cargo-clippy", allow(boxed_local))] // bug rust-lang-nursery/rust-clippy#1123 #![cfg_attr(feature = "cargo-clippy", allow(cyclomatic_complexity))] // large project #![cfg_attr(feature = "cargo-clippy", allow(derive_hash_xor_eq))] // there's an intentional incoherence -#![cfg_attr(feature = "cargo-clippy", allow(explicit_into_iter_loop))] // (unclear why) -#![cfg_attr(feature = "cargo-clippy", allow(explicit_iter_loop))] // (unclear why) +#![cfg_attr(feature = "cargo-clippy", allow(explicit_into_iter_loop))] // explicit loops are clearer +#![cfg_attr(feature = "cargo-clippy", allow(explicit_iter_loop))] // explicit loops are clearer #![cfg_attr(feature = "cargo-clippy", allow(identity_op))] // used for vertical alignment #![cfg_attr(feature = "cargo-clippy", allow(implicit_hasher))] // large project #![cfg_attr(feature = "cargo-clippy", allow(large_enum_variant))] // large project