Skip to content

Commit c2ab6a8

Browse files
committed
Rollup merge of rust-lang#22048 - LeoTestard:impl-patterns-used, r=pnkfelix
The live code analysis only visited the function's body when visiting a method, and not the FnDecl and the generics, resulting in code to be incorrectly marked as unused when it only appeared in the generics, the arguments, or the return type, whereas the same code in non-method functions was correctly detected as used. Fixes rust-lang#20343. Originally I just added a call to `walk_generics` and `walk_fndecl` alongside `walk_block` but then I noticed the `walk_method_helper` function did pretty much the same thing. The only difference is that it also calls `visit_mac`, but since this is not going to happen at this stage, I think it's ok. However let me know if this was not the right thing to do.
2 parents 319879c + 73201fd commit c2ab6a8

File tree

2 files changed

+39
-1
lines changed

2 files changed

+39
-1
lines changed

src/librustc/middle/dead.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ impl<'a, 'tcx> MarkSymbolVisitor<'a, 'tcx> {
234234
ast_map::NodeImplItem(impl_item) => {
235235
match *impl_item {
236236
ast::MethodImplItem(ref method) => {
237-
visit::walk_block(self, method.pe_body());
237+
visit::walk_method_helper(self, method);
238238
}
239239
ast::TypeImplItem(_) => {}
240240
}

src/test/run-pass/issue-20343.rs

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// Regression test for Issue #20343.
12+
13+
#![deny(dead_code)]
14+
15+
struct B { b: u32 }
16+
struct C;
17+
struct D;
18+
19+
trait T<A> {}
20+
impl<A> T<A> for () {}
21+
22+
impl B {
23+
// test for unused code in arguments
24+
fn foo(B { b }: B) -> u32 { b }
25+
26+
// test for unused code in return type
27+
fn bar() -> C { unsafe { ::std::mem::transmute(()) } }
28+
29+
// test for unused code in generics
30+
fn baz<A: T<D>>() {}
31+
}
32+
33+
pub fn main() {
34+
let b = B { b: 3 };
35+
B::foo(b);
36+
B::bar();
37+
B::baz::<()>();
38+
}

0 commit comments

Comments
 (0)