diff options
Diffstat (limited to 'crates/ra_hir_ty/src/infer.rs')
-rw-r--r-- | crates/ra_hir_ty/src/infer.rs | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/crates/ra_hir_ty/src/infer.rs b/crates/ra_hir_ty/src/infer.rs index a1201b3e4..f1b7e9442 100644 --- a/crates/ra_hir_ty/src/infer.rs +++ b/crates/ra_hir_ty/src/infer.rs | |||
@@ -24,12 +24,12 @@ use hir_def::{ | |||
24 | body::Body, | 24 | body::Body, |
25 | data::{ConstData, FunctionData}, | 25 | data::{ConstData, FunctionData}, |
26 | expr::{BindingAnnotation, ExprId, PatId}, | 26 | expr::{BindingAnnotation, ExprId, PatId}, |
27 | path::{known, Path}, | 27 | path::{path, Path}, |
28 | resolver::{HasResolver, Resolver, TypeNs}, | 28 | resolver::{HasResolver, Resolver, TypeNs}, |
29 | type_ref::{Mutability, TypeRef}, | 29 | type_ref::{Mutability, TypeRef}, |
30 | AdtId, AssocItemId, DefWithBodyId, FunctionId, StructFieldId, TypeAliasId, VariantId, | 30 | AdtId, AssocItemId, DefWithBodyId, FunctionId, StructFieldId, TypeAliasId, VariantId, |
31 | }; | 31 | }; |
32 | use hir_expand::{diagnostics::DiagnosticSink, name}; | 32 | use hir_expand::{diagnostics::DiagnosticSink, name::name}; |
33 | use ra_arena::map::ArenaMap; | 33 | use ra_arena::map::ArenaMap; |
34 | use ra_prof::profile; | 34 | use ra_prof::profile; |
35 | 35 | ||
@@ -422,73 +422,73 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> { | |||
422 | } | 422 | } |
423 | 423 | ||
424 | fn resolve_into_iter_item(&self) -> Option<TypeAliasId> { | 424 | fn resolve_into_iter_item(&self) -> Option<TypeAliasId> { |
425 | let path = known::std_iter_into_iterator(); | 425 | let path = path![std::iter::IntoIterator]; |
426 | let trait_ = self.resolver.resolve_known_trait(self.db, &path)?; | 426 | let trait_ = self.resolver.resolve_known_trait(self.db, &path)?; |
427 | self.db.trait_data(trait_).associated_type_by_name(&name::ITEM_TYPE) | 427 | self.db.trait_data(trait_).associated_type_by_name(&name![Item]) |
428 | } | 428 | } |
429 | 429 | ||
430 | fn resolve_ops_try_ok(&self) -> Option<TypeAliasId> { | 430 | fn resolve_ops_try_ok(&self) -> Option<TypeAliasId> { |
431 | let path = known::std_ops_try(); | 431 | let path = path![std::ops::Try]; |
432 | let trait_ = self.resolver.resolve_known_trait(self.db, &path)?; | 432 | let trait_ = self.resolver.resolve_known_trait(self.db, &path)?; |
433 | self.db.trait_data(trait_).associated_type_by_name(&name::OK_TYPE) | 433 | self.db.trait_data(trait_).associated_type_by_name(&name![Ok]) |
434 | } | 434 | } |
435 | 435 | ||
436 | fn resolve_ops_neg_output(&self) -> Option<TypeAliasId> { | 436 | fn resolve_ops_neg_output(&self) -> Option<TypeAliasId> { |
437 | let path = known::std_ops_neg(); | 437 | let path = path![std::ops::Neg]; |
438 | let trait_ = self.resolver.resolve_known_trait(self.db, &path)?; | 438 | let trait_ = self.resolver.resolve_known_trait(self.db, &path)?; |
439 | self.db.trait_data(trait_).associated_type_by_name(&name::OUTPUT_TYPE) | 439 | self.db.trait_data(trait_).associated_type_by_name(&name![Output]) |
440 | } | 440 | } |
441 | 441 | ||
442 | fn resolve_ops_not_output(&self) -> Option<TypeAliasId> { | 442 | fn resolve_ops_not_output(&self) -> Option<TypeAliasId> { |
443 | let path = known::std_ops_not(); | 443 | let path = path![std::ops::Not]; |
444 | let trait_ = self.resolver.resolve_known_trait(self.db, &path)?; | 444 | let trait_ = self.resolver.resolve_known_trait(self.db, &path)?; |
445 | self.db.trait_data(trait_).associated_type_by_name(&name::OUTPUT_TYPE) | 445 | self.db.trait_data(trait_).associated_type_by_name(&name![Output]) |
446 | } | 446 | } |
447 | 447 | ||
448 | fn resolve_future_future_output(&self) -> Option<TypeAliasId> { | 448 | fn resolve_future_future_output(&self) -> Option<TypeAliasId> { |
449 | let path = known::std_future_future(); | 449 | let path = path![std::future::Future]; |
450 | let trait_ = self.resolver.resolve_known_trait(self.db, &path)?; | 450 | let trait_ = self.resolver.resolve_known_trait(self.db, &path)?; |
451 | self.db.trait_data(trait_).associated_type_by_name(&name::OUTPUT_TYPE) | 451 | self.db.trait_data(trait_).associated_type_by_name(&name![Output]) |
452 | } | 452 | } |
453 | 453 | ||
454 | fn resolve_boxed_box(&self) -> Option<AdtId> { | 454 | fn resolve_boxed_box(&self) -> Option<AdtId> { |
455 | let path = known::std_boxed_box(); | 455 | let path = path![std::boxed::Box]; |
456 | let struct_ = self.resolver.resolve_known_struct(self.db, &path)?; | 456 | let struct_ = self.resolver.resolve_known_struct(self.db, &path)?; |
457 | Some(struct_.into()) | 457 | Some(struct_.into()) |
458 | } | 458 | } |
459 | 459 | ||
460 | fn resolve_range_full(&self) -> Option<AdtId> { | 460 | fn resolve_range_full(&self) -> Option<AdtId> { |
461 | let path = known::std_ops_range_full(); | 461 | let path = path![std::ops::RangeFull]; |
462 | let struct_ = self.resolver.resolve_known_struct(self.db, &path)?; | 462 | let struct_ = self.resolver.resolve_known_struct(self.db, &path)?; |
463 | Some(struct_.into()) | 463 | Some(struct_.into()) |
464 | } | 464 | } |
465 | 465 | ||
466 | fn resolve_range(&self) -> Option<AdtId> { | 466 | fn resolve_range(&self) -> Option<AdtId> { |
467 | let path = known::std_ops_range(); | 467 | let path = path![std::ops::Range]; |
468 | let struct_ = self.resolver.resolve_known_struct(self.db, &path)?; | 468 | let struct_ = self.resolver.resolve_known_struct(self.db, &path)?; |
469 | Some(struct_.into()) | 469 | Some(struct_.into()) |
470 | } | 470 | } |
471 | 471 | ||
472 | fn resolve_range_inclusive(&self) -> Option<AdtId> { | 472 | fn resolve_range_inclusive(&self) -> Option<AdtId> { |
473 | let path = known::std_ops_range_inclusive(); | 473 | let path = path![std::ops::RangeInclusive]; |
474 | let struct_ = self.resolver.resolve_known_struct(self.db, &path)?; | 474 | let struct_ = self.resolver.resolve_known_struct(self.db, &path)?; |
475 | Some(struct_.into()) | 475 | Some(struct_.into()) |
476 | } | 476 | } |
477 | 477 | ||
478 | fn resolve_range_from(&self) -> Option<AdtId> { | 478 | fn resolve_range_from(&self) -> Option<AdtId> { |
479 | let path = known::std_ops_range_from(); | 479 | let path = path![std::ops::RangeFrom]; |
480 | let struct_ = self.resolver.resolve_known_struct(self.db, &path)?; | 480 | let struct_ = self.resolver.resolve_known_struct(self.db, &path)?; |
481 | Some(struct_.into()) | 481 | Some(struct_.into()) |
482 | } | 482 | } |
483 | 483 | ||
484 | fn resolve_range_to(&self) -> Option<AdtId> { | 484 | fn resolve_range_to(&self) -> Option<AdtId> { |
485 | let path = known::std_ops_range_to(); | 485 | let path = path![std::ops::RangeTo]; |
486 | let struct_ = self.resolver.resolve_known_struct(self.db, &path)?; | 486 | let struct_ = self.resolver.resolve_known_struct(self.db, &path)?; |
487 | Some(struct_.into()) | 487 | Some(struct_.into()) |
488 | } | 488 | } |
489 | 489 | ||
490 | fn resolve_range_to_inclusive(&self) -> Option<AdtId> { | 490 | fn resolve_range_to_inclusive(&self) -> Option<AdtId> { |
491 | let path = known::std_ops_range_to_inclusive(); | 491 | let path = path![std::ops::RangeToInclusive]; |
492 | let struct_ = self.resolver.resolve_known_struct(self.db, &path)?; | 492 | let struct_ = self.resolver.resolve_known_struct(self.db, &path)?; |
493 | Some(struct_.into()) | 493 | Some(struct_.into()) |
494 | } | 494 | } |