From fb56e90e127854c72dcf0d51178b95c2a596a00f Mon Sep 17 00:00:00 2001 From: flip1995 Date: Mon, 1 Jul 2019 15:53:48 +0200 Subject: [PATCH 1/2] Test for melted ICE #4121 --- tests/ui/ice-4121.rs | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 tests/ui/ice-4121.rs diff --git a/tests/ui/ice-4121.rs b/tests/ui/ice-4121.rs new file mode 100644 index 00000000000..e1a142fdcb6 --- /dev/null +++ b/tests/ui/ice-4121.rs @@ -0,0 +1,13 @@ +use std::mem; + +pub struct Foo(A, B); + +impl Foo { + const HOST_SIZE: usize = mem::size_of::(); + + pub fn crash() -> bool { + Self::HOST_SIZE == 0 + } +} + +fn main() {} From cd4e593c96d8e9add2a4d7b18d96b46cbf9395eb Mon Sep 17 00:00:00 2001 From: flip1995 Date: Mon, 1 Jul 2019 15:56:06 +0200 Subject: [PATCH 2/2] Reenable cargo and rls tests in travis --- .travis.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index bc3b116a509..ee990111af9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,13 +51,12 @@ matrix: # We don't want to run these always because they go towards # the build limit within the Travis rust-lang account. # The jobs are approximately sorted by execution time - # disabled cargo and rls integration test due to https://github.com/rust-lang/rust-clippy/issues/4121 - #- env: INTEGRATION=rust-lang/cargo - # if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) + - env: INTEGRATION=rust-lang/cargo + if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) - env: INTEGRATION=rust-lang-nursery/chalk if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) - #- env: INTEGRATION=rust-lang/rls - # if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) + - env: INTEGRATION=rust-lang/rls + if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) - env: INTEGRATION=Geal/nom if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) - env: INTEGRATION=rust-lang/rustfmt