diff options
Diffstat (limited to 'crates')
-rw-r--r-- | crates/hir_def/src/import_map.rs | 6 | ||||
-rw-r--r-- | crates/hir_ty/src/infer/expr.rs | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/crates/hir_def/src/import_map.rs b/crates/hir_def/src/import_map.rs index c4dc894df..30b22f51d 100644 --- a/crates/hir_def/src/import_map.rs +++ b/crates/hir_def/src/import_map.rs | |||
@@ -432,6 +432,7 @@ fn item_import_kind(item: ItemInNs) -> Option<ImportKind> { | |||
432 | mod tests { | 432 | mod tests { |
433 | use base_db::{fixture::WithFixture, SourceDatabase, Upcast}; | 433 | use base_db::{fixture::WithFixture, SourceDatabase, Upcast}; |
434 | use expect_test::{expect, Expect}; | 434 | use expect_test::{expect, Expect}; |
435 | use stdx::format_to; | ||
435 | 436 | ||
436 | use crate::{data::FunctionData, test_db::TestDB, AssocContainerId, Lookup}; | 437 | use crate::{data::FunctionData, test_db::TestDB, AssocContainerId, Lookup}; |
437 | 438 | ||
@@ -467,9 +468,10 @@ mod tests { | |||
467 | if let ItemInNs::Types(ModuleDefId::FunctionId(function_id)) | 468 | if let ItemInNs::Types(ModuleDefId::FunctionId(function_id)) |
468 | | ItemInNs::Values(ModuleDefId::FunctionId(function_id)) = item | 469 | | ItemInNs::Values(ModuleDefId::FunctionId(function_id)) = item |
469 | { | 470 | { |
470 | full_path += &format!( | 471 | format_to!( |
472 | full_path, | ||
471 | "::{}", | 473 | "::{}", |
472 | FunctionData::fn_data_query(&db, function_id).name | 474 | FunctionData::fn_data_query(&db, function_id).name, |
473 | ); | 475 | ); |
474 | } | 476 | } |
475 | full_path | 477 | full_path |
diff --git a/crates/hir_ty/src/infer/expr.rs b/crates/hir_ty/src/infer/expr.rs index 70a3f3075..f2fc69b2f 100644 --- a/crates/hir_ty/src/infer/expr.rs +++ b/crates/hir_ty/src/infer/expr.rs | |||
@@ -648,6 +648,8 @@ impl<'a> InferenceContext<'a> { | |||
648 | } | 648 | } |
649 | Expr::Array(array) => { | 649 | Expr::Array(array) => { |
650 | let elem_ty = match &expected.ty { | 650 | let elem_ty = match &expected.ty { |
651 | // FIXME: remove when https://github.com/rust-lang/rust/issues/80501 is fixed | ||
652 | #[allow(unreachable_patterns)] | ||
651 | ty_app!(TypeCtor::Array, st) | ty_app!(TypeCtor::Slice, st) => { | 653 | ty_app!(TypeCtor::Array, st) | ty_app!(TypeCtor::Slice, st) => { |
652 | st.as_single().clone() | 654 | st.as_single().clone() |
653 | } | 655 | } |