aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
Diffstat (limited to 'crates')
-rw-r--r--crates/ra_hir_ty/src/expr.rs2
-rw-r--r--crates/ra_hir_ty/src/lib.rs13
-rw-r--r--crates/ra_hir_ty/src/match_checking.rs (renamed from crates/ra_hir_ty/src/_match.rs)0
3 files changed, 7 insertions, 8 deletions
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::{
12 diagnostics::{ 12 diagnostics::{
13 MismatchedArgCount, MissingFields, MissingMatchArms, MissingOkInTailExpr, MissingPatFields, 13 MismatchedArgCount, MissingFields, MissingMatchArms, MissingOkInTailExpr, MissingPatFields,
14 }, 14 },
15 match_checking::{is_useful, MatchCheckCtx, Matrix, PatStack, Usefulness},
15 utils::variant_data, 16 utils::variant_data,
16 ApplicationTy, InferenceResult, Ty, TypeCtor, 17 ApplicationTy, InferenceResult, Ty, TypeCtor,
17 _match::{is_useful, MatchCheckCtx, Matrix, PatStack, Usefulness},
18}; 18};
19 19
20pub use hir_def::{ 20pub 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;
31pub mod method_resolution; 31pub mod method_resolution;
32mod op; 32mod op;
33mod lower; 33mod lower;
34mod match_checking;
34pub(crate) mod infer; 35pub(crate) mod infer;
35pub mod display;
36pub(crate) mod utils; 36pub(crate) mod utils;
37
38pub mod display;
37pub mod db; 39pub mod db;
38pub mod diagnostics; 40pub mod diagnostics;
39pub mod expr; 41pub mod expr;
@@ -43,11 +45,8 @@ pub mod unsafe_validation;
43mod tests; 45mod tests;
44#[cfg(test)] 46#[cfg(test)]
45mod test_db; 47mod test_db;
46mod _match;
47 48
48use std::ops::Deref; 49use std::{iter, mem, ops::Deref, sync::Arc};
49use std::sync::Arc;
50use std::{iter, mem};
51 50
52use hir_def::{ 51use hir_def::{
53 expr::ExprId, 52 expr::ExprId,
@@ -55,14 +54,15 @@ use hir_def::{
55 AdtId, AssocContainerId, DefWithBodyId, GenericDefId, HasModule, Lookup, TraitId, TypeAliasId, 54 AdtId, AssocContainerId, DefWithBodyId, GenericDefId, HasModule, Lookup, TraitId, TypeAliasId,
56 TypeParamId, 55 TypeParamId,
57}; 56};
57use itertools::Itertools;
58use ra_db::{impl_intern_key, salsa, CrateId}; 58use ra_db::{impl_intern_key, salsa, CrateId};
59 59
60use crate::{ 60use crate::{
61 db::HirDatabase, 61 db::HirDatabase,
62 display::HirDisplay,
62 primitive::{FloatTy, IntTy}, 63 primitive::{FloatTy, IntTy},
63 utils::{generics, make_mut_slice, Generics}, 64 utils::{generics, make_mut_slice, Generics},
64}; 65};
65use display::HirDisplay;
66 66
67pub use autoderef::autoderef; 67pub use autoderef::autoderef;
68pub use infer::{InferTy, InferenceResult}; 68pub use infer::{InferTy, InferenceResult};
@@ -74,7 +74,6 @@ pub use lower::{
74pub use traits::{InEnvironment, Obligation, ProjectionPredicate, TraitEnvironment}; 74pub use traits::{InEnvironment, Obligation, ProjectionPredicate, TraitEnvironment};
75 75
76pub use chalk_ir::{BoundVar, DebruijnIndex}; 76pub use chalk_ir::{BoundVar, DebruijnIndex};
77use itertools::Itertools;
78 77
79/// A type constructor or type name: this might be something like the primitive 78/// A type constructor or type name: this might be something like the primitive
80/// type `bool`, a struct like `Vec`, or things like function pointers or 79/// 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