Rollup merge of #68050 - Centril:canon-error, r=Mark-Simulacrum

[rust.git] / src / librustc_lint / unused.rs

diff --git a/src/librustc_lint/unused.rs b/src/librustc_lint/unused.rs
index 1501e7084a439065956b3480f8c33931876de35c..d57f565d919be9341053e476160a9914359edb04 100644 (file)
--- a/src/librustc_lint/unused.rs
+++ b/src/librustc_lint/unused.rs
@@ -1,23 +1,22 @@
 use lint::{EarlyContext, LateContext, LintArray, LintContext};
 use lint::{EarlyLintPass, LateLintPass, LintPass};
-use rustc::hir;
-use rustc::hir::def::{DefKind, Res};
-use rustc::hir::def_id::DefId;
 use rustc::lint;
 use rustc::lint::builtin::UNUSED_ATTRIBUTES;
 use rustc::ty::adjustment;
 use rustc::ty::{self, Ty};
 use rustc_data_structures::fx::FxHashMap;
+use rustc_errors::{pluralize, Applicability};
 use rustc_feature::{AttributeType, BuiltinAttribute, BUILTIN_ATTRIBUTE_MAP};
-
+use rustc_hir as hir;
+use rustc_hir::def::{DefKind, Res};
+use rustc_hir::def_id::DefId;
+use rustc_span::symbol::Symbol;
+use rustc_span::symbol::{kw, sym};
+use rustc_span::{BytePos, Span};
 use syntax::ast;
 use syntax::attr;
-use syntax::errors::{pluralize, Applicability};
 use syntax::print::pprust;
-use syntax::symbol::Symbol;
-use syntax::symbol::{kw, sym};
 use syntax::util::parser;
-use syntax_pos::{BytePos, Span};
 
 use log::debug;
 
@@ -468,13 +467,13 @@ fn check_expr(&mut self, cx: &EarlyContext<'_>, e: &ast::Expr) {
             }
 
             If(ref cond, ref block, ..) => {
-                let left = e.span.lo() + syntax_pos::BytePos(2);
+                let left = e.span.lo() + rustc_span::BytePos(2);
                 let right = block.span.lo();
                 (cond, "`if` condition", true, Some(left), Some(right))
             }
 
             While(ref cond, ref block, ..) => {
-                let left = e.span.lo() + syntax_pos::BytePos(5);
+                let left = e.span.lo() + rustc_span::BytePos(5);
                 let right = block.span.lo();
                 (cond, "`while` condition", true, Some(left), Some(right))
             }
@@ -485,12 +484,12 @@ fn check_expr(&mut self, cx: &EarlyContext<'_>, e: &ast::Expr) {
             }
 
             Match(ref head, _) => {
-                let left = e.span.lo() + syntax_pos::BytePos(5);
+                let left = e.span.lo() + rustc_span::BytePos(5);
                 (head, "`match` head expression", true, Some(left), None)
             }
 
             Ret(Some(ref value)) => {
-                let left = e.span.lo() + syntax_pos::BytePos(3);
+                let left = e.span.lo() + rustc_span::BytePos(3);
                 (value, "`return` value", false, Some(left), None)
             }