Fix rebase fallout

This commit is contained in:
flip1995 2020-06-08 15:10:57 +02:00 committed by Robert Sedlacek
parent 346ee968bb
commit 6447507ab1
2 changed files with 5 additions and 4 deletions

View File

@ -268,7 +268,7 @@ macro_rules! declare_clippy_lint {
mod panic_unimplemented;
mod partialeq_ne_impl;
mod path_buf_push_overwrite;
pub mod pattern_type_mismatch;
mod pattern_type_mismatch;
mod precedence;
mod ptr;
mod ptr_offset_with_cast;

View File

@ -1,12 +1,12 @@
use crate::utils::{last_path_segment, span_lint_and_help};
use rustc::lint::in_external_macro;
use rustc::ty::subst::SubstsRef;
use rustc::ty::{AdtDef, FieldDef, Ty, TyKind, VariantDef};
use rustc_hir::{
intravisit, Body, Expr, ExprKind, FieldPat, FnDecl, HirId, LocalSource, MatchSource, Mutability, Pat, PatKind,
QPath, Stmt, StmtKind,
};
use rustc_lint::{LateContext, LateLintPass, LintContext};
use rustc_middle::lint::in_external_macro;
use rustc_middle::ty::subst::SubstsRef;
use rustc_middle::ty::{AdtDef, FieldDef, Ty, TyKind, VariantDef};
use rustc_session::{declare_lint_pass, declare_tool_lint};
use rustc_span::source_map::Span;
@ -120,6 +120,7 @@ fn apply_lint<'a, 'tcx>(
PATTERN_TYPE_MISMATCH,
span,
"type of pattern does not match the expression type",
None,
&format!(
"{}explicitly match against a `{}` pattern and adjust the enclosed variable bindings",
match (deref_possible, level) {