Auto merge of #5339 - matthiaskrgr:rollup, r=<try>

Rollup up 3 pull requests

changelog: none

We need all of these merging at the same time.

Author: bors

.github/workflows/clippy_bors.yml

@@ -209,6 +209,7 @@ jobs:
       run: |
         DIR=$CARGO_TARGET_DIR/debug
         find $DIR ! -executable -o -type d ! -path $DIR | xargs rm -rf
+        mkdir -f $DIR/integration
         mv $DIR/integration-* $DIR/integration
         rm -rf $CARGO_TARGET_DIR/release
 

clippy_lints/src/lib.rs

@@ -56,9 +56,9 @@ extern crate rustc_trait_selection;
 #[allow(unused_extern_crates)]
 extern crate rustc_typeck;
 
-use rustc::session::Session;
 use rustc_data_structures::fx::FxHashSet;
 use rustc_lint::LintId;
+use rustc_session::Session;
 
 /// Macro used to declare a Clippy lint.
 ///

clippy_lints/src/missing_inline.rs

@@ -69,7 +69,7 @@ fn check_missing_inline_attrs(cx: &LateContext<'_, '_>, attrs: &[ast::Attribute]
 }
 
 fn is_executable(cx: &LateContext<'_, '_>) -> bool {
-    use rustc::session::config::CrateType;
+    use rustc_session::config::CrateType;
 
     cx.tcx.sess.crate_types.get().iter().any(|t: &CrateType| match t {
         CrateType::Executable => true,

clippy_lints/src/trivially_copy_pass_by_ref.rs

@@ -3,13 +3,13 @@ use std::cmp;
 use crate::utils::{is_copy, is_self_ty, snippet, span_lint_and_sugg};
 use if_chain::if_chain;
 use matches::matches;
-use rustc::session::config::Config as SessionConfig;
 use rustc::ty;
 use rustc_errors::Applicability;
 use rustc_hir as hir;
 use rustc_hir::intravisit::FnKind;
 use rustc_hir::{Body, FnDecl, HirId, ItemKind, MutTy, Mutability, Node};
 use rustc_lint::{LateContext, LateLintPass};
+use rustc_session::config::Config as SessionConfig;
 use rustc_session::{declare_tool_lint, impl_lint_pass};
 use rustc_span::Span;
 use rustc_target::abi::LayoutOf;

clippy_lints/src/utils/attrs.rs

@@ -1,6 +1,6 @@
-use rustc::session::Session;
 use rustc_ast::ast;
 use rustc_errors::Applicability;
+use rustc_session::Session;
 use std::str::FromStr;
 
 /// Deprecation status of attributes known by Clippy.

clippy_lints/src/utils/author.rs

@@ -3,14 +3,14 @@
 
 use crate::utils::{get_attr, higher};
 use rustc::hir::map::Map;
-use rustc::session::Session;
 use rustc_ast::ast::{Attribute, LitFloatType, LitKind};
 use rustc_ast::walk_list;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_hir as hir;
 use rustc_hir::intravisit::{NestedVisitorMap, Visitor};
 use rustc_hir::{BindingAnnotation, Block, Expr, ExprKind, Pat, PatKind, QPath, Stmt, StmtKind, TyKind};
 use rustc_lint::{LateContext, LateLintPass, LintContext};
+use rustc_session::Session;
 use rustc_session::{declare_lint_pass, declare_tool_lint};
 
 declare_clippy_lint! {

clippy_lints/src/utils/inspector.rs

@@ -1,11 +1,11 @@
 //! checks for attributes
 
 use crate::utils::get_attr;
-use rustc::session::Session;
 use rustc_ast::ast::Attribute;
 use rustc_hir as hir;
 use rustc_hir::print;
 use rustc_lint::{LateContext, LateLintPass, LintContext};
+use rustc_session::Session;
 use rustc_session::{declare_lint_pass, declare_tool_lint};
 
 declare_clippy_lint! {

clippy_lints/src/write.rs

@@ -357,7 +357,7 @@ impl Write {
         };
         let tts = tts.clone();
 
-        let mut parser = parser::Parser::new(&cx.sess.parse_sess, tts, None, false, false, None);
+        let mut parser = parser::Parser::new(&cx.sess.parse_sess, tts, false, None);
         let mut expr: Option<Expr> = None;
         if is_write {
             expr = match parser.parse_expr().map_err(|mut err| err.cancel()) {

tests/ui/inefficient_to_string.stderr

@@ -35,21 +35,21 @@ LL |     let _: String = rrrstring.to_string();
    |
    = help: `&&std::string::String` implements `ToString` through a slower blanket impl, but `std::string::String` has a fast specialization of `ToString`
 
-error: calling `to_string` on `&&std::borrow::Cow<'_, str>`
+error: calling `to_string` on `&&std::borrow::Cow<str>`
   --> $DIR/inefficient_to_string.rs:29:21
    |
 LL |     let _: String = rrcow.to_string();
    |                     ^^^^^^^^^^^^^^^^^ help: try dereferencing the receiver: `(*rrcow).to_string()`
    |
-   = help: `&std::borrow::Cow<'_, str>` implements `ToString` through a slower blanket impl, but `std::borrow::Cow<'_, str>` has a fast specialization of `ToString`
+   = help: `&std::borrow::Cow<str>` implements `ToString` through a slower blanket impl, but `std::borrow::Cow<str>` has a fast specialization of `ToString`
 
-error: calling `to_string` on `&&&std::borrow::Cow<'_, str>`
+error: calling `to_string` on `&&&std::borrow::Cow<str>`
   --> $DIR/inefficient_to_string.rs:30:21
    |
 LL |     let _: String = rrrcow.to_string();
    |                     ^^^^^^^^^^^^^^^^^^ help: try dereferencing the receiver: `(**rrrcow).to_string()`
    |
-   = help: `&&std::borrow::Cow<'_, str>` implements `ToString` through a slower blanket impl, but `std::borrow::Cow<'_, str>` has a fast specialization of `ToString`
+   = help: `&&std::borrow::Cow<str>` implements `ToString` through a slower blanket impl, but `std::borrow::Cow<str>` has a fast specialization of `ToString`
 
 error: aborting due to 6 previous errors
 

tests/ui/transmute.stderr

@@ -1,4 +1,4 @@
-error: transmute from a type (`&'a T`) to itself
+error: transmute from a type (`&T`) to itself
   --> $DIR/transmute.rs:19:20
    |
 LL |     let _: &'a T = core::intrinsics::transmute(t);