4 files changed, 11 insertions, 12 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 66ae19b1e..b33c97ccb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -11,9 +11,9 @@ dependencies = [
 
 [[package]]
 name = "adler"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccc9a9dd069569f212bc4330af9f17c4afb5e8ce185e83dbb14f1349dda18b10"
+checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e"
 
 [[package]]
 name = "aho-corasick"
@@ -1722,9 +1722,9 @@ checksum = "ab16ced94dbd8a46c82fd81e3ed9a8727dac2977ea869d217bcc4ea1f122e81f"
 
 [[package]]
 name = "syn"
-version = "1.0.33"
+version = "1.0.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd"
+checksum = "936cae2873c940d92e697597c5eee105fb570cd5689c695806f672883653349b"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/crates/ra_hir_ty/src/expr.rs b/crates/ra_hir_ty/src/expr.rs
index 72577d114..d44562b22 100644
--- a/crates/ra_hir_ty/src/expr.rs
+++ b/crates/ra_hir_ty/src/expr.rs
@@ -12,9 +12,9 @@ use crate::{
     diagnostics::{
         MismatchedArgCount, MissingFields, MissingMatchArms, MissingOkInTailExpr, MissingPatFields,
     },
+    match_checking::{is_useful, MatchCheckCtx, Matrix, PatStack, Usefulness},
     utils::variant_data,
     ApplicationTy, InferenceResult, Ty, TypeCtor,
-    _match::{is_useful, MatchCheckCtx, Matrix, PatStack, Usefulness},
 };
 
 pub use hir_def::{
diff --git a/crates/ra_hir_ty/src/lib.rs b/crates/ra_hir_ty/src/lib.rs
index c12bed4af..34f0bd4ce 100644
--- a/crates/ra_hir_ty/src/lib.rs
+++ b/crates/ra_hir_ty/src/lib.rs
@@ -31,9 +31,11 @@ pub mod traits;
 pub mod method_resolution;
 mod op;
 mod lower;
+mod match_checking;
 pub(crate) mod infer;
-pub mod display;
 pub(crate) mod utils;
+
+pub mod display;
 pub mod db;
 pub mod diagnostics;
 pub mod expr;
@@ -43,11 +45,8 @@ pub mod unsafe_validation;
 mod tests;
 #[cfg(test)]
 mod test_db;
-mod _match;
 
-use std::ops::Deref;
-use std::sync::Arc;
-use std::{iter, mem};
+use std::{iter, mem, ops::Deref, sync::Arc};
 
 use hir_def::{
     expr::ExprId,
@@ -55,14 +54,15 @@ use hir_def::{
     AdtId, AssocContainerId, DefWithBodyId, GenericDefId, HasModule, Lookup, TraitId, TypeAliasId,
     TypeParamId,
 };
+use itertools::Itertools;
 use ra_db::{impl_intern_key, salsa, CrateId};
 
 use crate::{
     db::HirDatabase,
+    display::HirDisplay,
     primitive::{FloatTy, IntTy},
     utils::{generics, make_mut_slice, Generics},
 };
-use display::HirDisplay;
 
 pub use autoderef::autoderef;
 pub use infer::{InferTy, InferenceResult};
@@ -74,7 +74,6 @@ pub use lower::{
 pub use traits::{InEnvironment, Obligation, ProjectionPredicate, TraitEnvironment};
 
 pub use chalk_ir::{BoundVar, DebruijnIndex};
-use itertools::Itertools;
 
 /// A type constructor or type name: this might be something like the primitive
 /// type `bool`, a struct like `Vec`, or things like function pointers or
diff --git a/crates/ra_hir_ty/src/_match.rs b/crates/ra_hir_ty/src/match_checking.rs
index 5495ce284..5495ce284 100644
--- a/crates/ra_hir_ty/src/_match.rs
+++ b/crates/ra_hir_ty/src/match_checking.rs