diff --git a/src/librustc/middle/dead.rs b/src/librustc/middle/dead.rs index 66305ae8836ee..5ec4ba204238a 100644 --- a/src/librustc/middle/dead.rs +++ b/src/librustc/middle/dead.rs @@ -395,7 +395,13 @@ fn create_and_seed_worklist<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, krate: &hir::Crate) -> Vec { - let worklist = access_levels.map.iter().map(|(&id, _)| id).chain( + let worklist = access_levels.map.iter().filter_map(|(&id, level)| { + if level >= &privacy::AccessLevel::Reachable { + Some(id) + } else { + None + } + }).chain( // Seed entry point tcx.sess.entry_fn.borrow().map(|(id, _, _)| id) ).collect::>(); diff --git a/src/test/run-pass/async-await.rs b/src/test/run-pass/async-await.rs index 0cd9bad03af9f..59da758035466 100644 --- a/src/test/run-pass/async-await.rs +++ b/src/test/run-pass/async-await.rs @@ -170,6 +170,7 @@ fn main() { async_closure, async_fn, async_fn_with_internal_borrow, + Foo::async_method, |x| { async move { unsafe { await!(unsafe_async_fn(x)) } diff --git a/src/test/run-pass/impl-trait/existential-minimal.rs b/src/test/ui/impl-trait/existential-minimal.rs similarity index 97% rename from src/test/run-pass/impl-trait/existential-minimal.rs rename to src/test/ui/impl-trait/existential-minimal.rs index bae4c685e7c48..ff9209251aa37 100644 --- a/src/test/run-pass/impl-trait/existential-minimal.rs +++ b/src/test/ui/impl-trait/existential-minimal.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// run-pass +// compile-pass fn main() {} diff --git a/src/test/run-pass/impl-trait/issue-42479.rs b/src/test/ui/impl-trait/issue-42479.rs similarity index 97% rename from src/test/run-pass/impl-trait/issue-42479.rs rename to src/test/ui/impl-trait/issue-42479.rs index 1da5cd36ca949..fbf2c3f8a4e49 100644 --- a/src/test/run-pass/impl-trait/issue-42479.rs +++ b/src/test/ui/impl-trait/issue-42479.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// run-pass +// compile-pass use std::iter::once; diff --git a/src/test/run-pass/impl-trait/issue-49376.rs b/src/test/ui/impl-trait/issue-49376.rs similarity index 98% rename from src/test/run-pass/impl-trait/issue-49376.rs rename to src/test/ui/impl-trait/issue-49376.rs index 10379dad37d9e..1dfea0b957329 100644 --- a/src/test/run-pass/impl-trait/issue-49376.rs +++ b/src/test/ui/impl-trait/issue-49376.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// run-pass +// compile-pass // Tests for nested self-reference which caused a stack overflow. diff --git a/src/test/run-pass/issues/issue-49556.rs b/src/test/ui/issue-49556.rs similarity index 97% rename from src/test/run-pass/issues/issue-49556.rs rename to src/test/ui/issue-49556.rs index aeeb55d6c6006..7f7b349c3a0bf 100644 --- a/src/test/run-pass/issues/issue-49556.rs +++ b/src/test/ui/issue-49556.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// run-pass +// compile-pass fn iter<'a>(data: &'a [usize]) -> impl Iterator + 'a { data.iter() .map( diff --git a/src/test/ui/lint/lint-dead-code-1.rs b/src/test/ui/lint/lint-dead-code-1.rs index 2fe72365bab1c..944d57b5ba8f5 100644 --- a/src/test/ui/lint/lint-dead-code-1.rs +++ b/src/test/ui/lint/lint-dead-code-1.rs @@ -109,6 +109,10 @@ fn bar() { //~ ERROR: function is never used foo(); } +fn baz() -> impl Copy { //~ ERROR: function is never used + "I'm unused, too" +} + // Code with #[allow(dead_code)] should be marked live (and thus anything it // calls is marked live) #[allow(dead_code)] diff --git a/src/test/ui/lint/lint-dead-code-1.stderr b/src/test/ui/lint/lint-dead-code-1.stderr index 9802b7e8f383b..9d8e44c25d87e 100644 --- a/src/test/ui/lint/lint-dead-code-1.stderr +++ b/src/test/ui/lint/lint-dead-code-1.stderr @@ -58,5 +58,11 @@ error: function is never used: `bar` LL | fn bar() { //~ ERROR: function is never used | ^^^^^^^^ -error: aborting due to 9 previous errors +error: function is never used: `baz` + --> $DIR/lint-dead-code-1.rs:112:1 + | +LL | fn baz() -> impl Copy { //~ ERROR: function is never used + | ^^^^^^^^^^^^^^^^^^^^^ + +error: aborting due to 10 previous errors diff --git a/src/test/run-pass/traits/conservative_impl_trait.rs b/src/test/ui/traits/conservative_impl_trait.rs similarity index 97% rename from src/test/run-pass/traits/conservative_impl_trait.rs rename to src/test/ui/traits/conservative_impl_trait.rs index b6abeb916a9ee..3f119affd8c9b 100644 --- a/src/test/run-pass/traits/conservative_impl_trait.rs +++ b/src/test/ui/traits/conservative_impl_trait.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// run-pass +// compile-pass // #39665 fn batches(n: &u32) -> impl Iterator {