diff options
| author | Omer Ben-Amram <[email protected]> | 2019-12-14 15:29:30 +0000 |
|---|---|---|
| committer | Omer Ben-Amram <[email protected]> | 2019-12-14 15:29:30 +0000 |
| commit | 5e4e713fc9c201852fc5fbafd57e5b9243149a78 (patch) | |
| tree | 996b679a9ae1d07be1edd9eb04e93d433c6524a3 /crates/ra_hir_ty/src/expr.rs | |
| parent | 083010f6339e558184f06ce76a18e1ad0b0ee936 (diff) | |
| parent | 77db6177658b32f69ad7ebfdef96c1b3b2893fdd (diff) | |
Merge branch 'refs/heads/master' into feature/granular-scopes
Diffstat (limited to 'crates/ra_hir_ty/src/expr.rs')
| -rw-r--r-- | crates/ra_hir_ty/src/expr.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir_ty/src/expr.rs b/crates/ra_hir_ty/src/expr.rs index d2bd64e5c..f752a9f09 100644 --- a/crates/ra_hir_ty/src/expr.rs +++ b/crates/ra_hir_ty/src/expr.rs | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | use std::sync::Arc; | 3 | use std::sync::Arc; |
| 4 | 4 | ||
| 5 | use hir_def::{ | 5 | use hir_def::{ |
| 6 | path::{known, Path}, | 6 | path::{path, Path}, |
| 7 | resolver::HasResolver, | 7 | resolver::HasResolver, |
| 8 | AdtId, FunctionId, | 8 | AdtId, FunctionId, |
| 9 | }; | 9 | }; |
| @@ -124,7 +124,7 @@ impl<'a, 'b> ExprValidator<'a, 'b> { | |||
| 124 | None => return, | 124 | None => return, |
| 125 | }; | 125 | }; |
| 126 | 126 | ||
| 127 | let std_result_path = known::std_result_result(); | 127 | let std_result_path = path![std::result::Result]; |
| 128 | 128 | ||
| 129 | let resolver = self.func.resolver(db); | 129 | let resolver = self.func.resolver(db); |
| 130 | let std_result_enum = match resolver.resolve_known_enum(db, &std_result_path) { | 130 | let std_result_enum = match resolver.resolve_known_enum(db, &std_result_path) { |