From 9787bddac577a6aa24388fb91286474a7a8cf0bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Thu, 25 Mar 2021 21:03:20 +0200 Subject: Use arrayvec 0.6 --- Cargo.lock | 6 ++++-- crates/hir/Cargo.toml | 2 +- crates/hir/src/lib.rs | 2 +- crates/hir_ty/Cargo.toml | 2 +- crates/hir_ty/src/display.rs | 6 ++---- crates/hir_ty/src/method_resolution.rs | 4 ++-- crates/syntax/Cargo.toml | 2 +- crates/syntax/src/ast/edit.rs | 16 ++++++++-------- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7f666ca61..b36bca0ab 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "addr2line" version = "0.14.1" @@ -47,9 +49,9 @@ checksum = "33954243bd79057c2de7338850b85983a44588021f8a5fee574a8888c6de4344" [[package]] name = "arrayvec" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +checksum = "682f88bd1270f264991da8922b89ee1fb520b0da73f97c9f73cda54980123017" [[package]] name = "atty" diff --git a/crates/hir/Cargo.toml b/crates/hir/Cargo.toml index 55e9c3f0c..2ef5bcbc9 100644 --- a/crates/hir/Cargo.toml +++ b/crates/hir/Cargo.toml @@ -13,7 +13,7 @@ doctest = false log = "0.4.8" rustc-hash = "1.1.0" either = "1.5.3" -arrayvec = "0.5.1" +arrayvec = "0.6" itertools = "0.10.0" smallvec = "1.4.0" diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs index 6fa676c4d..05a60e158 100644 --- a/crates/hir/src/lib.rs +++ b/crates/hir/src/lib.rs @@ -2238,7 +2238,7 @@ pub enum ScopeDef { } impl ScopeDef { - pub fn all_items(def: PerNs) -> ArrayVec<[Self; 3]> { + pub fn all_items(def: PerNs) -> ArrayVec { let mut items = ArrayVec::new(); match (def.take_types(), def.take_values()) { diff --git a/crates/hir_ty/Cargo.toml b/crates/hir_ty/Cargo.toml index 0ef27cd37..030b7eebe 100644 --- a/crates/hir_ty/Cargo.toml +++ b/crates/hir_ty/Cargo.toml @@ -12,7 +12,7 @@ doctest = false [dependencies] cov-mark = { version = "1.1", features = ["thread-local"] } itertools = "0.10.0" -arrayvec = "0.5.1" +arrayvec = "0.6" smallvec = "1.2.0" ena = "0.14.0" log = "0.4.8" 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 Option> { + ) -> Option> { // 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::::new(); $( v.extend(db.lang_item(cur_crate, $name.into())); )+ diff --git a/crates/syntax/Cargo.toml b/crates/syntax/Cargo.toml index 0c3fec3c7..9f01acc26 100644 --- a/crates/syntax/Cargo.toml +++ b/crates/syntax/Cargo.toml @@ -16,7 +16,7 @@ itertools = "0.10.0" rowan = "0.13.0-pre.3" rustc_lexer = { version = "710.0.0", package = "rustc-ap-rustc_lexer" } rustc-hash = "1.1.0" -arrayvec = "0.5.1" +arrayvec = "0.6" once_cell = "1.3.1" indexmap = "1.4.0" smol_str = { version = "0.1.15", features = ["serde"] } diff --git a/crates/syntax/src/ast/edit.rs b/crates/syntax/src/ast/edit.rs index 18820786a..2d1d08fba 100644 --- a/crates/syntax/src/ast/edit.rs +++ b/crates/syntax/src/ast/edit.rs @@ -32,7 +32,7 @@ impl ast::BinExpr { impl ast::Fn { #[must_use] pub fn with_body(&self, body: ast::BlockExpr) -> ast::Fn { - let mut to_insert: ArrayVec<[SyntaxElement; 2]> = ArrayVec::new(); + let mut to_insert: ArrayVec = ArrayVec::new(); let old_body_or_semi: SyntaxElement = if let Some(old_body) = self.body() { old_body.syntax().clone().into() } else if let Some(semi) = self.semicolon_token() { @@ -55,7 +55,7 @@ impl ast::Fn { let anchor = self.name().expect("The function must have a name").syntax().clone(); - let mut to_insert: ArrayVec<[SyntaxElement; 1]> = ArrayVec::new(); + let mut to_insert: ArrayVec = ArrayVec::new(); to_insert.push(generic_args.syntax().clone().into()); self.insert_children(InsertPosition::After(anchor.into()), to_insert) } @@ -96,7 +96,7 @@ where impl ast::Impl { #[must_use] pub fn with_assoc_item_list(&self, items: ast::AssocItemList) -> ast::Impl { - let mut to_insert: ArrayVec<[SyntaxElement; 2]> = ArrayVec::new(); + let mut to_insert: ArrayVec = ArrayVec::new(); if let Some(old_items) = self.assoc_item_list() { let to_replace: SyntaxElement = old_items.syntax().clone().into(); to_insert.push(items.syntax().clone().into()); @@ -141,7 +141,7 @@ impl ast::AssocItemList { }, }; let ws = tokens::WsBuilder::new(&format!("{}{}", whitespace, indent)); - let to_insert: ArrayVec<[SyntaxElement; 2]> = + let to_insert: ArrayVec = [ws.ws().into(), item.syntax().clone().into()].into(); self.insert_children(position, to_insert) } @@ -192,7 +192,7 @@ impl ast::RecordExprFieldList { tokens::single_space() }; - let mut to_insert: ArrayVec<[SyntaxElement; 4]> = ArrayVec::new(); + let mut to_insert: ArrayVec = ArrayVec::new(); to_insert.push(space.into()); to_insert.push(field.syntax().clone().into()); to_insert.push(make::token(T![,]).into()); @@ -305,7 +305,7 @@ impl ast::PathSegment { iter::once(type_args.syntax().clone().into()), ); } - let mut to_insert: ArrayVec<[SyntaxElement; 2]> = ArrayVec::new(); + let mut to_insert: ArrayVec = ArrayVec::new(); if turbo { to_insert.push(make::token(T![::]).into()); } @@ -444,7 +444,7 @@ impl ast::MatchArmList { let arm_ws = tokens::WsBuilder::new(" "); let match_indent = &leading_indent(self.syntax()).unwrap_or_default(); let match_ws = tokens::WsBuilder::new(&format!("\n{}", match_indent)); - let to_insert: ArrayVec<[SyntaxElement; 3]> = + let to_insert: ArrayVec = [arm_ws.ws().into(), item.syntax().clone().into(), match_ws.ws().into()].into(); self.insert_children(position, to_insert) } @@ -465,7 +465,7 @@ impl ast::GenericParamList { pub fn append_param(&self, item: ast::GenericParam) -> ast::GenericParamList { let space = tokens::single_space(); - let mut to_insert: ArrayVec<[SyntaxElement; 4]> = ArrayVec::new(); + let mut to_insert: ArrayVec = ArrayVec::new(); if self.generic_params().next().is_some() { to_insert.push(space.into()); } -- cgit v1.2.3 From bc5c86543b1bf384555471415dee770888a1781d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Thu, 25 Mar 2021 21:06:48 +0200 Subject: Use more std::array::IntoIter --- crates/syntax/src/ast/edit.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/crates/syntax/src/ast/edit.rs b/crates/syntax/src/ast/edit.rs index 2d1d08fba..8c60927e4 100644 --- a/crates/syntax/src/ast/edit.rs +++ b/crates/syntax/src/ast/edit.rs @@ -2,7 +2,7 @@ //! immutable, all function here return a fresh copy of the tree, instead of //! doing an in-place modification. use std::{ - fmt, iter, + array, fmt, iter, ops::{self, RangeInclusive}, }; @@ -55,9 +55,8 @@ impl ast::Fn { let anchor = self.name().expect("The function must have a name").syntax().clone(); - let mut to_insert: ArrayVec = ArrayVec::new(); - to_insert.push(generic_args.syntax().clone().into()); - self.insert_children(InsertPosition::After(anchor.into()), to_insert) + let to_insert = [generic_args.syntax().clone().into()]; + self.insert_children(InsertPosition::After(anchor.into()), array::IntoIter::new(to_insert)) } } -- cgit v1.2.3