diff options
author | Benjamin Coenen <[email protected]> | 2020-04-07 16:59:09 +0100 |
---|---|---|
committer | Benjamin Coenen <[email protected]> | 2020-04-07 16:59:09 +0100 |
commit | 18a5e164838e1dc2abcc6b79d4fc2f96ffd2507c (patch) | |
tree | bc80b5c49c3b7ba31c7fe967bb34fe14bac9d5ed /crates/ra_hir_ty/src/lib.rs | |
parent | ab864ed259c10ff51f7c9c3421d098eeea7b0245 (diff) | |
parent | 33c364b545350134b945fbca834194fd1a28fe08 (diff) |
Merge branch 'master' of github.com:rust-analyzer/rust-analyzer
Diffstat (limited to 'crates/ra_hir_ty/src/lib.rs')
-rw-r--r-- | crates/ra_hir_ty/src/lib.rs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/crates/ra_hir_ty/src/lib.rs b/crates/ra_hir_ty/src/lib.rs index a9022dee7..18f74d3b1 100644 --- a/crates/ra_hir_ty/src/lib.rs +++ b/crates/ra_hir_ty/src/lib.rs | |||
@@ -1,6 +1,11 @@ | |||
1 | //! The type system. We currently use this to infer types for completion, hover | 1 | //! The type system. We currently use this to infer types for completion, hover |
2 | //! information and various assists. | 2 | //! information and various assists. |
3 | 3 | ||
4 | #[allow(unused)] | ||
5 | macro_rules! eprintln { | ||
6 | ($($tt:tt)*) => { stdx::eprintln!($($tt)*) }; | ||
7 | } | ||
8 | |||
4 | macro_rules! impl_froms { | 9 | macro_rules! impl_froms { |
5 | ($e:ident: $($v:ident $(($($sv:ident),*))?),*) => { | 10 | ($e:ident: $($v:ident $(($($sv:ident),*))?),*) => { |
6 | $( | 11 | $( |
@@ -38,6 +43,7 @@ mod tests; | |||
38 | #[cfg(test)] | 43 | #[cfg(test)] |
39 | mod test_db; | 44 | mod test_db; |
40 | mod marks; | 45 | mod marks; |
46 | mod _match; | ||
41 | 47 | ||
42 | use std::ops::Deref; | 48 | use std::ops::Deref; |
43 | use std::sync::Arc; | 49 | use std::sync::Arc; |
@@ -855,7 +861,8 @@ pub trait TypeWalk { | |||
855 | ); | 861 | ); |
856 | self | 862 | self |
857 | } | 863 | } |
858 | // /// Shifts up debruijn indices of `Ty::Bound` vars by `n`. | 864 | |
865 | /// Shifts up debruijn indices of `Ty::Bound` vars by `n`. | ||
859 | fn shift_bound_vars(self, n: DebruijnIndex) -> Self | 866 | fn shift_bound_vars(self, n: DebruijnIndex) -> Self |
860 | where | 867 | where |
861 | Self: Sized, | 868 | Self: Sized, |