Auto merge of rust-lang#4992 - phansch:rustup_foobar, r=matthiaskrgr

Rustup to rust-lang#67853

Specifically caused by rust-lang#67786

changelog: none

Author: bors

clippy_lints/src/approx_const.rs

@@ -3,9 +3,9 @@ use rustc::declare_lint_pass;
 use rustc::hir::*;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_session::declare_tool_lint;
+use rustc_span::symbol;
 use std::f64::consts as f64;
 use syntax::ast::{FloatTy, LitFloatType, LitKind};
-use syntax::symbol;
 
 declare_clippy_lint! {
     /// **What it does:** Checks for floating point literals that approximate

clippy_lints/src/arithmetic.rs

@@ -4,7 +4,7 @@ use rustc::hir;
 use rustc::impl_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_session::declare_tool_lint;
-use syntax::source_map::Span;
+use rustc_span::source_map::Span;
 
 declare_clippy_lint! {
     /// **What it does:** Checks for plain integer arithmetic.

clippy_lints/src/attrs.rs

@@ -15,10 +15,10 @@ use rustc::lint::{
 use rustc::ty;
 use rustc_errors::Applicability;
 use rustc_session::declare_tool_lint;
+use rustc_span::source_map::Span;
 use rustc_span::symbol::Symbol;
 use semver::Version;
 use syntax::ast::{AttrKind, AttrStyle, Attribute, Lit, LitKind, MetaItemKind, NestedMetaItem};
-use syntax::source_map::Span;
 use syntax::util::lev_distance::find_best_match_for_name;
 
 declare_clippy_lint! {

clippy_lints/src/bit_mask.rs

@@ -7,8 +7,8 @@ use rustc::impl_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_errors::Applicability;
 use rustc_session::declare_tool_lint;
+use rustc_span::source_map::Span;
 use syntax::ast::LitKind;
-use syntax::source_map::Span;
 
 declare_clippy_lint! {
     /// **What it does:** Checks for incompatible bit masks in comparisons.

clippy_lints/src/booleans.rs

@@ -9,8 +9,8 @@ use rustc::hir::*;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_errors::Applicability;
 use rustc_session::declare_tool_lint;
+use rustc_span::source_map::Span;
 use syntax::ast::LitKind;
-use syntax::source_map::Span;
 
 declare_clippy_lint! {
     /// **What it does:** Checks for boolean expressions that can be written more

clippy_lints/src/cargo_common_metadata.rs

@@ -6,7 +6,8 @@ use crate::utils::span_lint;
 use rustc::declare_lint_pass;
 use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass};
 use rustc_session::declare_tool_lint;
-use syntax::{ast::*, source_map::DUMMY_SP};
+use rustc_span::source_map::DUMMY_SP;
+use syntax::ast::*;
 
 declare_clippy_lint! {
     /// **What it does:** Checks to see if all common metadata is defined in

clippy_lints/src/cognitive_complexity.rs

@@ -5,9 +5,9 @@ use rustc::hir::*;
 use rustc::impl_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintContext, LintPass};
 use rustc_session::declare_tool_lint;
+use rustc_span::source_map::Span;
 use rustc_span::BytePos;
 use syntax::ast::Attribute;
-use syntax::source_map::Span;
 
 use crate::utils::{match_type, paths, snippet_opt, span_help_and_lint, LimitStack};
 

clippy_lints/src/copies.rs

@@ -6,9 +6,9 @@ use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc::ty::Ty;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_session::declare_tool_lint;
+use rustc_span::symbol::Symbol;
 use std::collections::hash_map::Entry;
 use std::hash::BuildHasherDefault;
-use syntax::symbol::Symbol;
 
 declare_clippy_lint! {
     /// **What it does:** Checks for consecutive `if`s with the same condition.

clippy_lints/src/dbg_macro.rs

@@ -3,8 +3,8 @@ use rustc::declare_lint_pass;
 use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass};
 use rustc_errors::Applicability;
 use rustc_session::declare_tool_lint;
+use rustc_span::source_map::Span;
 use syntax::ast;
-use syntax::source_map::Span;
 use syntax::tokenstream::TokenStream;
 
 declare_clippy_lint! {

clippy_lints/src/derive.rs

@@ -6,7 +6,7 @@ use rustc::hir::*;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc::ty::{self, Ty};
 use rustc_session::declare_tool_lint;
-use syntax::source_map::Span;
+use rustc_span::source_map::Span;
 
 declare_clippy_lint! {
     /// **What it does:** Checks for deriving `Hash` but implementing `PartialEq`

clippy_lints/src/doc.rs

@@ -5,10 +5,10 @@ use rustc::impl_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_data_structures::fx::FxHashSet;
 use rustc_session::declare_tool_lint;
+use rustc_span::source_map::{BytePos, MultiSpan, Span};
 use rustc_span::Pos;
 use std::ops::Range;
 use syntax::ast::{AttrKind, Attribute};
-use syntax::source_map::{BytePos, MultiSpan, Span};
 use url::Url;
 
 declare_clippy_lint! {

clippy_lints/src/double_comparison.rs

@@ -5,7 +5,7 @@ use rustc::hir::*;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_errors::Applicability;
 use rustc_session::declare_tool_lint;
-use syntax::source_map::Span;
+use rustc_span::source_map::Span;
 
 use crate::utils::{snippet_with_applicability, span_lint_and_sugg, SpanlessEq};
 

clippy_lints/src/duration_subsec.rs

@@ -4,7 +4,7 @@ use rustc::hir::*;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_errors::Applicability;
 use rustc_session::declare_tool_lint;
-use syntax::source_map::Spanned;
+use rustc_span::source_map::Spanned;
 
 use crate::consts::{constant, Constant};
 use crate::utils::paths;

clippy_lints/src/entry.rs

@@ -8,7 +8,7 @@ use rustc::hir::*;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_errors::Applicability;
 use rustc_session::declare_tool_lint;
-use syntax::source_map::Span;
+use rustc_span::source_map::Span;
 
 declare_clippy_lint! {
     /// **What it does:** Checks for uses of `contains_key` + `insert` on `HashMap`

clippy_lints/src/enum_glob_use.rs

@@ -6,7 +6,7 @@ use rustc::hir::def::{DefKind, Res};
 use rustc::hir::*;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_session::declare_tool_lint;
-use syntax::source_map::Span;
+use rustc_span::source_map::Span;
 
 declare_clippy_lint! {
     /// **What it does:** Checks for `use Enum::*`.

clippy_lints/src/enum_variants.rs

@@ -5,9 +5,9 @@ use crate::utils::{span_help_and_lint, span_lint};
 use rustc::impl_lint_pass;
 use rustc::lint::{EarlyContext, EarlyLintPass, Lint, LintArray, LintPass};
 use rustc_session::declare_tool_lint;
+use rustc_span::source_map::Span;
+use rustc_span::symbol::Symbol;
 use syntax::ast::*;
-use syntax::source_map::Span;
-use syntax::symbol::Symbol;
 
 declare_clippy_lint! {
     /// **What it does:** Detects enumeration variants that are prefixed or suffixed

clippy_lints/src/erasing_op.rs

@@ -2,7 +2,7 @@ use rustc::declare_lint_pass;
 use rustc::hir::*;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_session::declare_tool_lint;
-use syntax::source_map::Span;
+use rustc_span::source_map::Span;
 
 use crate::consts::{constant_simple, Constant};
 use crate::utils::span_lint;

clippy_lints/src/escape.rs

@@ -6,8 +6,8 @@ use rustc::ty::layout::LayoutOf;
 use rustc::ty::{self, Ty};
 use rustc::util::nodemap::HirIdSet;
 use rustc_session::declare_tool_lint;
+use rustc_span::source_map::Span;
 use rustc_typeck::expr_use_visitor::*;
-use syntax::source_map::Span;
 
 use crate::utils::span_lint;
 

clippy_lints/src/format.rs

@@ -9,8 +9,8 @@ use rustc::hir::*;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintContext, LintPass};
 use rustc_errors::Applicability;
 use rustc_session::declare_tool_lint;
+use rustc_span::source_map::Span;
 use syntax::ast::LitKind;
-use syntax::source_map::Span;
 
 declare_clippy_lint! {
     /// **What it does:** Checks for the use of `format!("string literal with no

clippy_lints/src/functions.rs

@@ -11,9 +11,9 @@ use rustc::ty::{self, Ty};
 use rustc_data_structures::fx::FxHashSet;
 use rustc_errors::Applicability;
 use rustc_session::declare_tool_lint;
+use rustc_span::source_map::Span;
 use rustc_target::spec::abi::Abi;
 use syntax::ast::Attribute;
-use syntax::source_map::Span;
 
 declare_clippy_lint! {
     /// **What it does:** Checks for functions with too many parameters.

clippy_lints/src/get_last_with_len.rs

@@ -7,9 +7,9 @@ use rustc::hir::{BinOpKind, Expr, ExprKind};
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_errors::Applicability;
 use rustc_session::declare_tool_lint;
+use rustc_span::source_map::Spanned;
+use rustc_span::symbol::Symbol;
 use syntax::ast::LitKind;
-use syntax::source_map::Spanned;
-use syntax::symbol::Symbol;
 
 declare_clippy_lint! {
     /// **What it does:** Checks for using `x.get(x.len() - 1)` instead of

clippy_lints/src/identity_op.rs

@@ -3,7 +3,7 @@ use rustc::hir::*;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc::ty;
 use rustc_session::declare_tool_lint;
-use syntax::source_map::Span;
+use rustc_span::source_map::Span;
 
 use crate::consts::{constant_simple, Constant};
 use crate::utils::{clip, snippet, span_lint, unsext};

clippy_lints/src/implicit_return.rs

@@ -11,7 +11,7 @@ use rustc::{
 };
 use rustc_errors::Applicability;
 use rustc_session::declare_tool_lint;
-use syntax::source_map::Span;
+use rustc_span::source_map::Span;
 
 declare_clippy_lint! {
     /// **What it does:** Checks for missing return statements at the end of a block.

clippy_lints/src/len_zero.rs

@@ -7,8 +7,8 @@ use rustc::ty;
 use rustc_data_structures::fx::FxHashSet;
 use rustc_errors::Applicability;
 use rustc_session::declare_tool_lint;
+use rustc_span::source_map::{Span, Spanned};
 use syntax::ast::{LitKind, Name};
-use syntax::source_map::{Span, Spanned};
 
 declare_clippy_lint! {
     /// **What it does:** Checks for getting the length of something via `.len()`

clippy_lints/src/lifetimes.rs

@@ -6,8 +6,8 @@ use rustc::hir::*;
 use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintContext, LintPass};
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_session::declare_tool_lint;
-use syntax::source_map::Span;
-use syntax::symbol::kw;
+use rustc_span::source_map::Span;
+use rustc_span::symbol::kw;
 
 use crate::reexport::*;
 use crate::utils::{last_path_segment, span_lint, trait_ref_of_method};

clippy_lints/src/loops.rs

@@ -16,12 +16,12 @@ use crate::utils::{is_type_diagnostic_item, qpath_res, same_tys, sext, sugg};
 use rustc::ty::{self, Ty};
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_errors::Applicability;
+use rustc_span::source_map::Span;
 use rustc_span::{BytePos, Symbol};
 use rustc_typeck::expr_use_visitor::*;
 use std::iter::{once, Iterator};
 use std::mem;
 use syntax::ast;
-use syntax::source_map::Span;
 
 use crate::utils::paths;
 use crate::utils::{

clippy_lints/src/main_recursion.rs

@@ -2,8 +2,8 @@ use rustc::hir::{Crate, Expr, ExprKind, QPath};
 use rustc::impl_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc_session::declare_tool_lint;
+use rustc_span::symbol::sym;
 use syntax::ast::AttrKind;
-use syntax::symbol::sym;
 
 use crate::utils::{is_entrypoint_fn, snippet, span_help_and_lint};
 use if_chain::if_chain;

clippy_lints/src/map_clone.rs

@@ -9,8 +9,8 @@ use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc::ty;
 use rustc_errors::Applicability;
 use rustc_session::declare_tool_lint;
+use rustc_span::source_map::Span;
 use syntax::ast::Ident;
-use syntax::source_map::Span;
 
 declare_clippy_lint! {
     /// **What it does:** Checks for usage of `iterator.map(|x| x.clone())` and suggests

clippy_lints/src/map_unit_fn.rs

@@ -7,7 +7,7 @@ use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc::ty::{self, Ty};
 use rustc_errors::Applicability;
 use rustc_session::declare_tool_lint;
-use syntax::source_map::Span;
+use rustc_span::source_map::Span;
 
 declare_clippy_lint! {
     /// **What it does:** Checks for usage of `option.map(f)` where f is a function

clippy_lints/src/matches.rs

@@ -13,10 +13,10 @@ use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintC
 use rustc::ty::{self, Ty};
 use rustc_errors::Applicability;
 use rustc_session::declare_tool_lint;
+use rustc_span::source_map::Span;
 use std::cmp::Ordering;
 use std::collections::Bound;
 use syntax::ast::LitKind;
-use syntax::source_map::Span;
 
 declare_clippy_lint! {
     /// **What it does:** Checks for matches with a single arm where an `if let`

clippy_lints/src/mem_replace.rs

@@ -8,7 +8,7 @@ use rustc::hir::{BorrowKind, Expr, ExprKind, Mutability, QPath};
 use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintPass};
 use rustc_errors::Applicability;
 use rustc_session::declare_tool_lint;
-use syntax::source_map::Span;
+use rustc_span::source_map::Span;
 
 declare_clippy_lint! {
     /// **What it does:** Checks for `mem::replace()` on an `Option` with

clippy_lints/src/methods/mod.rs

@@ -16,9 +16,9 @@ use rustc::lint::{in_external_macro, LateContext, LateLintPass, Lint, LintArray,
 use rustc::ty::{self, Predicate, Ty};
 use rustc_errors::Applicability;
 use rustc_session::declare_tool_lint;
+use rustc_span::source_map::Span;
+use rustc_span::symbol::{sym, Symbol, SymbolStr};
 use syntax::ast;
-use syntax::source_map::Span;
-use syntax::symbol::{sym, Symbol, SymbolStr};
 
 use crate::utils::usage::mutated_variables;
 use crate::utils::{

clippy_lints/src/methods/option_map_unwrap_or.rs

@@ -5,8 +5,8 @@ use rustc::hir::{self, *};
 use rustc::lint::LateContext;
 use rustc_data_structures::fx::FxHashSet;
 use rustc_errors::Applicability;
+use rustc_span::source_map::Span;
 use rustc_span::symbol::Symbol;
-use syntax::source_map::Span;
 
 use super::OPTION_MAP_UNWRAP_OR;
 

clippy_lints/src/misc.rs

@@ -7,8 +7,8 @@ use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc::ty;
 use rustc_errors::Applicability;
 use rustc_session::declare_tool_lint;
+use rustc_span::source_map::{ExpnKind, Span};
 use syntax::ast::LitKind;
-use syntax::source_map::{ExpnKind, Span};
 
 use crate::consts::{constant, Constant};
 use crate::utils::sugg::Sugg;

clippy_lints/src/misc_early.rs

@@ -8,8 +8,8 @@ use rustc::lint::{in_external_macro, EarlyContext, EarlyLintPass, LintArray, Lin
 use rustc_data_structures::fx::FxHashMap;
 use rustc_errors::Applicability;
 use rustc_session::declare_tool_lint;
+use rustc_span::source_map::Span;
 use syntax::ast::*;
-use syntax::source_map::Span;
 use syntax::visit::{walk_expr, FnKind, Visitor};
 
 declare_clippy_lint! {

clippy_lints/src/missing_doc.rs

@@ -12,9 +12,9 @@ use rustc::impl_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintContext, LintPass};
 use rustc::ty;
 use rustc_session::declare_tool_lint;
+use rustc_span::source_map::Span;
 use syntax::ast::{self, MetaItem, MetaItemKind};
 use syntax::attr;
-use syntax::source_map::Span;
 
 declare_clippy_lint! {
     /// **What it does:** Warns if there is missing doc for any documentable item

clippy_lints/src/missing_inline.rs

@@ -3,8 +3,8 @@ use rustc::declare_lint_pass;
 use rustc::hir;
 use rustc::lint::{self, LateContext, LateLintPass, LintArray, LintContext, LintPass};
 use rustc_session::declare_tool_lint;
+use rustc_span::source_map::Span;
 use syntax::ast;
-use syntax::source_map::Span;
 
 declare_clippy_lint! {
     /// **What it does:** it lints if an exported function, method, trait method with default impl,

clippy_lints/src/multiple_crate_versions.rs

@@ -4,7 +4,8 @@ use crate::utils::span_lint;
 use rustc::declare_lint_pass;
 use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass};
 use rustc_session::declare_tool_lint;
-use syntax::{ast::*, source_map::DUMMY_SP};
+use rustc_span::source_map::DUMMY_SP;
+use syntax::ast::*;
 
 use itertools::Itertools;
 

clippy_lints/src/mut_key.rs

@@ -4,7 +4,7 @@ use rustc::hir;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc::ty::{Adt, Dynamic, Opaque, Param, RawPtr, Ref, Ty, TypeAndMut};
 use rustc_session::declare_tool_lint;
-use syntax::source_map::Span;
+use rustc_span::source_map::Span;
 
 declare_clippy_lint! {
     /// **What it does:** Checks for sets/maps with mutable key types.