diff options
-rw-r--r-- | crates/ra_hir_ty/src/expr.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir_ty/src/lib.rs | 13 | ||||
-rw-r--r-- | crates/ra_hir_ty/src/match_checking.rs (renamed from crates/ra_hir_ty/src/_match.rs) | 0 | ||||
-rw-r--r-- | xtask/src/release.rs | 5 |
4 files changed, 11 insertions, 9 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 | ||
20 | pub use hir_def::{ | 20 | 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; | |||
31 | pub mod method_resolution; | 31 | pub mod method_resolution; |
32 | mod op; | 32 | mod op; |
33 | mod lower; | 33 | mod lower; |
34 | mod match_checking; | ||
34 | pub(crate) mod infer; | 35 | pub(crate) mod infer; |
35 | pub mod display; | ||
36 | pub(crate) mod utils; | 36 | pub(crate) mod utils; |
37 | |||
38 | pub mod display; | ||
37 | pub mod db; | 39 | pub mod db; |
38 | pub mod diagnostics; | 40 | pub mod diagnostics; |
39 | pub mod expr; | 41 | pub mod expr; |
@@ -43,11 +45,8 @@ pub mod unsafe_validation; | |||
43 | mod tests; | 45 | mod tests; |
44 | #[cfg(test)] | 46 | #[cfg(test)] |
45 | mod test_db; | 47 | mod test_db; |
46 | mod _match; | ||
47 | 48 | ||
48 | use std::ops::Deref; | 49 | use std::{iter, mem, ops::Deref, sync::Arc}; |
49 | use std::sync::Arc; | ||
50 | use std::{iter, mem}; | ||
51 | 50 | ||
52 | use hir_def::{ | 51 | use 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 | }; |
57 | use itertools::Itertools; | ||
58 | use ra_db::{impl_intern_key, salsa, CrateId}; | 58 | use ra_db::{impl_intern_key, salsa, CrateId}; |
59 | 59 | ||
60 | use crate::{ | 60 | use 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 | }; |
65 | use display::HirDisplay; | ||
66 | 66 | ||
67 | pub use autoderef::autoderef; | 67 | pub use autoderef::autoderef; |
68 | pub use infer::{InferTy, InferenceResult}; | 68 | pub use infer::{InferTy, InferenceResult}; |
@@ -74,7 +74,6 @@ pub use lower::{ | |||
74 | pub use traits::{InEnvironment, Obligation, ProjectionPredicate, TraitEnvironment}; | 74 | pub use traits::{InEnvironment, Obligation, ProjectionPredicate, TraitEnvironment}; |
75 | 75 | ||
76 | pub use chalk_ir::{BoundVar, DebruijnIndex}; | 76 | pub use chalk_ir::{BoundVar, DebruijnIndex}; |
77 | use 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 | |||
diff --git a/xtask/src/release.rs b/xtask/src/release.rs index 170cfee9f..530bd8205 100644 --- a/xtask/src/release.rs +++ b/xtask/src/release.rs | |||
@@ -93,7 +93,10 @@ impl PromoteCmd { | |||
93 | run!("git commit -m':arrow_up: rust-analyzer'")?; | 93 | run!("git commit -m':arrow_up: rust-analyzer'")?; |
94 | if !self.dry_run { | 94 | if !self.dry_run { |
95 | run!("git push")?; | 95 | run!("git push")?; |
96 | run!("xdg-open https://github.com/matklad/rust/pull/new/{}", branch)?; | 96 | run!( |
97 | "xdg-open https://github.com/matklad/rust/pull/new/{}?body=r%3F%20%40ghost", | ||
98 | branch | ||
99 | )?; | ||
97 | } | 100 | } |
98 | Ok(()) | 101 | Ok(()) |
99 | } | 102 | } |