Merge #8200

8200: Use arrayvec 0.6 r=kjeremy a=lnicola

Closes #8198

changelog skip

Co-authored-by: Laurențiu Nicola <[email protected]>

2 files changed, 4 insertions, 6 deletions

diff --git a/crates/hir_ty/src/display.rs b/crates/hir_ty/src/display.rs
index 6149067c7..51480304b 100644
--- a/crates/hir_ty/src/display.rs
+++ b/crates/hir_ty/src/display.rs
@@ -1,8 +1,7 @@
 //! FIXME: write short doc here
 
-use std::fmt;
+use std::{array, fmt};
 
-use arrayvec::ArrayVec;
 use chalk_ir::Mutability;
 use hir_def::{
     db::DefDatabase,
@@ -669,8 +668,7 @@ fn fn_traits(db: &dyn DefDatabase, trait_: TraitId) -> impl Iterator<Item = Trai
         db.lang_item(krate, "fn_mut".into()),
         db.lang_item(krate, "fn_once".into()),
     ];
-    // FIXME: Replace ArrayVec when into_iter is a thing on arrays
-    ArrayVec::from(fn_traits).into_iter().flatten().flat_map(|it| it.as_trait())
+    array::IntoIter::new(fn_traits).into_iter().flatten().flat_map(|it| it.as_trait())
 }
 
 pub fn write_bounds_like_dyn_trait_with_prefix(
diff --git a/crates/hir_ty/src/method_resolution.rs b/crates/hir_ty/src/method_resolution.rs
index 84d9a1e18..bf7d5eded 100644
--- a/crates/hir_ty/src/method_resolution.rs
+++ b/crates/hir_ty/src/method_resolution.rs
@@ -228,12 +228,12 @@ impl Ty {
         &self,
         db: &dyn HirDatabase,
         cur_crate: CrateId,
-    ) -> Option<ArrayVec<[CrateId; 2]>> {
+    ) -> Option<ArrayVec<CrateId, 2>> {
         // Types like slice can have inherent impls in several crates, (core and alloc).
         // The corresponding impls are marked with lang items, so we can use them to find the required crates.
         macro_rules! lang_item_crate {
             ($($name:expr),+ $(,)?) => {{
-                let mut v = ArrayVec::<[LangItemTarget; 2]>::new();
+                let mut v = ArrayVec::<LangItemTarget, 2>::new();
                 $(
                     v.extend(db.lang_item(cur_crate, $name.into()));
                 )+