Auto merge of rust-lang#65830 - Quantumplation:master, r=davidtwco,estebank

Use ident.span instead of def_span in dead-code pass Hello! First time contributor! :) This should fix rust-lang#58729. According to @estebank in the duplicate rust-lang#63064, def_span scans forward on the line until it finds a {, and if it can't find one, falls back to the span for the whole item. This was apparently written before the identifier span was explicitly tracked on each node. This means that if an unused function signature spans multiple lines, the entire function (potentially hundreds of lines) gets flagged as dead code. This could, for example, cause IDEs to add error squiggly's to the whole function. By using the span from the ident instead, we narrow the scope of this in most cases. In a wider sense, it's probably safe to use ident.span instead of def_span in most locations throughout the whole code base, but since this is my first contribution, I kept it small. Some interesting points that came up while I was working on this: - I reorganized the tests a bit to bring some of the dead code ones all into the same location - A few tests were for things unrelated to dead code (like the path-lookahead for parens), so I added #![allow(dead_code)] and cleaned up the stderr file to reduce noise in the future - The same fix doesn't apply to const and static declarations. I tried adding these cases to the match expression, but that created a much wider change to tests and error messages, so I left it off until I could get some code review to validate the approach.

Author: bors

src/librustc_passes/dead.rs

@@ -569,16 +569,27 @@ impl Visitor<'tcx> for DeadVisitor<'tcx> {
 
  fn visit_item(&mut self, item: &'tcx hir::Item) {
  if self.should_warn_about_item(item) {
- // For items that have a definition with a signature followed by a
- // block, point only at the signature.
+ // For most items, we want to highlight its identifier
  let span = match item.kind {
  hir::ItemKind::Fn(..) |
  hir::ItemKind::Mod(..) |
  hir::ItemKind::Enum(..) |
  hir::ItemKind::Struct(..) |
  hir::ItemKind::Union(..) |
  hir::ItemKind::Trait(..) |
- hir::ItemKind::Impl(..) => self.tcx.sess.source_map().def_span(item.span),
+ hir::ItemKind::Impl(..) => {
+ // FIXME(66095): Because item.span is annotated with things
+ // like expansion data, and ident.span isn't, we use the
+ // def_span method if it's part of a macro invocation
+ // (and thus has asource_callee set).
+ // We should probably annotate ident.span with the macro
+ // context, but that's a larger change.
+ if item.span.source_callee().is_some() {
+ self.tcx.sess.source_map().def_span(item.span)
+ } else {
+ item.ident.span
+ }
+ },
  _ => item.span,
  };
  let participle = match item.kind {

src/test/ui-fulldeps/lint-plugin-cmdline-allow.stderr

@@ -7,10 +7,10 @@ LL | #![plugin(lint_plugin_test)]
  = note: `#[warn(deprecated)]` on by default
 
 warning: function is never used: `lintme`
- --> $DIR/lint-plugin-cmdline-allow.rs:10:1
+ --> $DIR/lint-plugin-cmdline-allow.rs:10:4
  |
 LL | fn lintme() { }
- | ^^^^^^^^^^^
+ |  ^^^^^^
  |
 note: lint level defined here
  --> $DIR/lint-plugin-cmdline-allow.rs:7:9

src/test/ui-fulldeps/lint-tool-cmdline-allow.stderr

@@ -19,10 +19,10 @@ LL | fn lintme() {}
  = note: `#[warn(clippy::test_lint)]` on by default
 
 warning: function is never used: `lintme`
- --> $DIR/lint-tool-cmdline-allow.rs:10:1
+ --> $DIR/lint-tool-cmdline-allow.rs:10:4
  |
 LL | fn lintme() {}
- | ^^^^^^^^^^^
+ |  ^^^^^^
  |
 note: lint level defined here
  --> $DIR/lint-tool-cmdline-allow.rs:7:9

src/test/ui/dead-code-alias-in-pat.rs renamed to src/test/ui/lint/dead-code/alias-in-pat.rs

@@ -1,11 +1,11 @@
 error: function is never used: `foo`
- --> $DIR/fail-no-dead-code.rs:4:1
+ --> $DIR/basic.rs:4:4
  |
 LL | fn foo() {
- | ^^^^^^^^
+ |  ^^^
  |
 note: lint level defined here
- --> $DIR/fail-no-dead-code.rs:1:9
+ --> $DIR/basic.rs:1:9
  |
 LL | #![deny(dead_code)]
  | ^^^^^^^^^