Fix tools

Author: mejrs

src/librustdoc/config.rs

@@ -9,14 +9,15 @@ use rustc_data_structures::fx::FxIndexMap;
 use rustc_errors::DiagCtxtHandle;
 use rustc_lint::Level;
 use rustc_session::config::{
-    self, CodegenOptions, CrateType, ErrorOutputType, Externs, Input, JsonUnusedExterns,
+    self, CodegenOptions, ErrorOutputType, Externs, Input, JsonUnusedExterns,
     OptionsTargetModifiers, OutFileName, Sysroot, UnstableOptions, get_cmd_lint_options,
     nightly_options, parse_crate_types_from_list, parse_externs, parse_target_triple,
 };
 use rustc_session::search_paths::SearchPath;
 use rustc_session::{EarlyDiagCtxt, getopts};
 use rustc_span::edition::Edition;
 use rustc_span::{FileName, RemapPathScopeComponents};
+use rustc_structures::CrateType;
 use rustc_target::spec::TargetTuple;
 use smallvec::SmallVec;
 

src/librustdoc/core.rs

@@ -20,11 +20,12 @@ use rustc_middle::hir::nested_filter;
 use rustc_middle::ty::{self, ParamEnv, Ty, TyCtxt};
 use rustc_session::Session;
 use rustc_session::config::{
-    self, CrateType, ErrorOutputType, Input, OutputType, OutputTypes, ResolveDocLinks,
+    self, ErrorOutputType, Input, OutputType, OutputTypes, ResolveDocLinks,
 };
 pub(crate) use rustc_session::config::{Options, UnstableOptions};
 use rustc_span::source_map;
 use rustc_span::symbol::sym;
+use rustc_structures::CrateType;
 use tracing::{debug, info};
 
 use crate::clean::inline::build_trait;

src/librustdoc/doctest.rs

@@ -27,9 +27,10 @@ use rustc_hir::{Attribute, CRATE_HIR_ID};
 use rustc_interface::interface;
 use rustc_lint as lint;
 use rustc_middle::ty::TyCtxt;
-use rustc_session::config::{self, CrateType, ErrorOutputType, Input};
+use rustc_session::config::{self, ErrorOutputType, Input};
 use rustc_span::edition::Edition;
 use rustc_span::{FileName, RemapPathScopeComponents, Span};
+use rustc_structures::CrateType;
 use rustc_target::spec::{Target, TargetTuple};
 use tempfile::{Builder as TempFileBuilder, TempDir};
 use tracing::{debug, info};

src/librustdoc/lib.rs

@@ -53,6 +53,7 @@ extern crate rustc_resolve;
 extern crate rustc_serialize;
 extern crate rustc_session;
 extern crate rustc_span;
+extern crate rustc_structures;
 extern crate rustc_target;
 extern crate rustc_trait_selection;
 extern crate test;

src/librustdoc/passes/collect_intra_doc_links.rs

@@ -24,10 +24,10 @@ use rustc_resolve::rustdoc::{
     MalformedGenerics, has_primitive_or_keyword_or_attribute_docs, prepare_to_doc_link_resolution,
     source_span_for_markdown_range, strip_generics_from_path,
 };
-use rustc_session::config::CrateType;
 use rustc_span::BytePos;
 use rustc_span::def_id::ModId;
 use rustc_span::symbol::{Ident, Symbol, sym};
+use rustc_structures::CrateType;
 use smallvec::{SmallVec, smallvec};
 use tracing::{debug, info, instrument, trace};
 

src/tools/clippy/clippy_lints/src/lib.rs

@@ -38,8 +38,8 @@ extern crate rustc_lint;
 extern crate rustc_middle;
 extern crate rustc_parse_format;
 extern crate rustc_resolve;
-extern crate rustc_session;
 extern crate rustc_span;
+extern crate rustc_structures;
 extern crate rustc_target;
 extern crate rustc_trait_selection;
 

src/tools/clippy/clippy_lints/src/missing_inline.rs

@@ -1,7 +1,7 @@
 use clippy_utils::diagnostics::span_lint;
 use rustc_hir::{ImplItem, ImplItemKind, Item, ItemKind, OwnerId, TraitFn, TraitItem, TraitItemKind, find_attr};
 use rustc_lint::{LateContext, LateLintPass, declare_lint_pass};
-use rustc_session::config::CrateType;
+use rustc_structures::CrateType;
 use rustc_span::Span;
 
 declare_clippy_lint! {