rust-analyzer

diff --git a/crates/hir-def/src/body/pretty.rs b/crates/hir-def/src/body/pretty.rs
index fad4d7a4da..6ecf1c20d6 100644
--- a/crates/hir-def/src/body/pretty.rs
+++ b/crates/hir-def/src/body/pretty.rs

@@ -54,7 +54,7 @@ pub(super) fn print_body_hir(db: &dyn DefDatabase, body: &Body, owner: DefWithBo

let mut p = Printer { db, body, buf: header, indent_level: 0, needs_indent: false };

if let DefWithBodyId::FunctionId(it) = owner {

p.buf.push('(');

- body.params.iter().zip(&db.function_data(it).params).for_each(|(&param, ty)| {

+ body.params.iter().zip(db.function_data(it).params.iter()).for_each(|(&param, ty)| {

p.print_pat(param);

p.buf.push(':');

p.print_type_ref(ty);

diff --git a/crates/hir-def/src/data.rs b/crates/hir-def/src/data.rs
index 718f241cf7..93fd741aff 100644
--- a/crates/hir-def/src/data.rs
+++ b/crates/hir-def/src/data.rs

@@ -34,7 +34,7 @@ use crate::{

#[derive(Debug, Clone, PartialEq, Eq)]

pub struct FunctionData {

pub name: Name,

- pub params: Vec<Interned<TypeRef>>,

+ pub params: Box<[Interned<TypeRef>]>,

pub ret_type: Interned<TypeRef>,

pub attrs: Attrs,

pub visibility: RawVisibility,

@@ -177,7 +177,7 @@ pub struct TypeAliasData {

pub rustc_has_incoherent_inherent_impls: bool,

pub rustc_allow_incoherent_impl: bool,

/// Bounds restricting the type alias itself (eg. `type Ty: Bound;` in a trait or impl).

- pub bounds: Vec<Interned<TypeBound>>,

+ pub bounds: Box<[Interned<TypeBound>]>,

}

impl TypeAliasData {

@@ -210,7 +210,7 @@ impl TypeAliasData {

is_extern: matches!(loc.container, ItemContainerId::ExternBlockId(_)),

rustc_has_incoherent_inherent_impls,

rustc_allow_incoherent_impl,

- bounds: typ.bounds.to_vec(),

+ bounds: typ.bounds.clone(),

})

}

diff --git a/crates/hir-def/src/generics.rs b/crates/hir-def/src/generics.rs
index 1e2535a8a9..fac90e6630 100644
--- a/crates/hir-def/src/generics.rs
+++ b/crates/hir-def/src/generics.rs

@@ -227,7 +227,7 @@ impl GenericParams {

let mut expander = Lazy::new(|| {

(module.def_map(db), Expander::new(db, loc.source(db).file_id, module))

});

- for param in &func_data.params {

+ for param in func_data.params.iter() {

generic_params.fill_implicit_impl_trait_args(db, &mut expander, param);

}

diff --git a/crates/hir-def/src/item_tree/lower.rs b/crates/hir-def/src/item_tree/lower.rs
index c0a880a64b..30b649d2f3 100644
--- a/crates/hir-def/src/item_tree/lower.rs
+++ b/crates/hir-def/src/item_tree/lower.rs

@@ -396,14 +396,7 @@ impl<'a> Ctx<'a> {

let bounds = self.lower_type_bounds(type_alias);

let generic_params = self.lower_generic_params(HasImplicitSelf::No, type_alias);

let ast_id = self.source_ast_id_map.ast_id(type_alias);

- let res = TypeAlias {

- name,

- visibility,

- bounds: bounds.into_boxed_slice(),

- generic_params,

- type_ref,

- ast_id,

- };

+ let res = TypeAlias { name, visibility, bounds, generic_params, type_ref, ast_id };

Some(id(self.data().type_aliases.alloc(res)))

}

@@ -637,13 +630,13 @@ impl<'a> Ctx<'a> {

Interned::new(generics)

}

- fn lower_type_bounds(&mut self, node: &dyn ast::HasTypeBounds) -> Vec<Interned<TypeBound>> {

+ fn lower_type_bounds(&mut self, node: &dyn ast::HasTypeBounds) -> Box<[Interned<TypeBound>]> {

match node.type_bound_list() {

Some(bound_list) => bound_list

.bounds()

.map(|it| Interned::new(TypeBound::from_ast(&self.body_ctx, it)))

.collect(),

- None => Vec::new(),

+ None => Box::default(),

}

diff --git a/crates/hir-ty/src/db.rs b/crates/hir-ty/src/db.rs
index 9c96b5ab8d..410bcbf035 100644
--- a/crates/hir-ty/src/db.rs
+++ b/crates/hir-ty/src/db.rs

@@ -20,8 +20,8 @@ use crate::{

method_resolution::{InherentImpls, TraitImpls, TyFingerprint},

mir::{BorrowckResult, MirBody, MirLowerError},

Binders, CallableDefId, ClosureId, Const, FnDefId, GenericArg, ImplTraitId, InferenceResult,

- Interner, PolyFnSig, QuantifiedWhereClause, ReturnTypeImplTraits, Substitution, TraitRef, Ty,

- TyDefId, ValueTyDefId,

+ Interner, PolyFnSig, QuantifiedWhereClause, ReturnTypeImplTraits, Substitution,

+ TraitEnvironment, TraitRef, Ty, TyDefId, ValueTyDefId,

};

use hir_expand::name::Name;

@@ -47,7 +47,7 @@ pub trait HirDatabase: DefDatabase + Upcast<dyn DefDatabase> {

&self,

def: DefWithBodyId,

subst: Substitution,

- env: Arc<crate::TraitEnvironment>,

+ env: Arc<TraitEnvironment>,

) -> Result<Arc<MirBody>, MirLowerError>;

#[salsa::invoke(crate::mir::monomorphized_mir_body_for_closure_query)]

@@ -55,7 +55,7 @@ pub trait HirDatabase: DefDatabase + Upcast<dyn DefDatabase> {

&self,

def: ClosureId,

subst: Substitution,

- env: Arc<crate::TraitEnvironment>,

+ env: Arc<TraitEnvironment>,

) -> Result<Arc<MirBody>, MirLowerError>;

#[salsa::invoke(crate::mir::borrowck_query)]

@@ -81,7 +81,7 @@ pub trait HirDatabase: DefDatabase + Upcast<dyn DefDatabase> {

&self,

def: GeneralConstId,

subst: Substitution,

- trait_env: Option<Arc<crate::TraitEnvironment>>,

+ trait_env: Option<Arc<TraitEnvironment>>,

) -> Result<Const, ConstEvalError>;

#[salsa::invoke(crate::consteval::const_eval_static_query)]

@@ -104,16 +104,12 @@ pub trait HirDatabase: DefDatabase + Upcast<dyn DefDatabase> {

&self,

def: AdtId,

subst: Substitution,

- env: Arc<crate::TraitEnvironment>,

+ env: Arc<TraitEnvironment>,

) -> Result<Arc<Layout>, LayoutError>;

#[salsa::invoke(crate::layout::layout_of_ty_query)]

#[salsa::cycle(crate::layout::layout_of_ty_recover)]

- fn layout_of_ty(

- &self,

- ty: Ty,

- env: Arc<crate::TraitEnvironment>,

- ) -> Result<Arc<Layout>, LayoutError>;

+ fn layout_of_ty(&self, ty: Ty, env: Arc<TraitEnvironment>) -> Result<Arc<Layout>, LayoutError>;

#[salsa::invoke(crate::layout::target_data_layout_query)]

fn target_data_layout(&self, krate: CrateId) -> Option<Arc<TargetDataLayout>>;

@@ -121,7 +117,7 @@ pub trait HirDatabase: DefDatabase + Upcast<dyn DefDatabase> {

#[salsa::invoke(crate::method_resolution::lookup_impl_method_query)]

fn lookup_impl_method(

&self,

- env: Arc<crate::TraitEnvironment>,

+ env: Arc<TraitEnvironment>,

func: FunctionId,

fn_subst: Substitution,

) -> (FunctionId, Substitution);

@@ -149,10 +145,10 @@ pub trait HirDatabase: DefDatabase + Upcast<dyn DefDatabase> {

#[salsa::invoke(crate::lower::trait_environment_for_body_query)]

#[salsa::transparent]

- fn trait_environment_for_body(&self, def: DefWithBodyId) -> Arc<crate::TraitEnvironment>;

+ fn trait_environment_for_body(&self, def: DefWithBodyId) -> Arc<TraitEnvironment>;

#[salsa::invoke(crate::lower::trait_environment_query)]

- fn trait_environment(&self, def: GenericDefId) -> Arc<crate::TraitEnvironment>;

+ fn trait_environment(&self, def: GenericDefId) -> Arc<TraitEnvironment>;

#[salsa::invoke(crate::lower::generic_defaults_query)]

#[salsa::cycle(crate::lower::generic_defaults_recover)]

@@ -249,7 +245,7 @@ pub trait HirDatabase: DefDatabase + Upcast<dyn DefDatabase> {

fn normalize_projection(

&self,

projection: crate::ProjectionTy,

- env: Arc<crate::TraitEnvironment>,

+ env: Arc<TraitEnvironment>,

) -> Ty;

#[salsa::invoke(trait_solve_wait)]

diff --git a/crates/hir-ty/src/lower.rs b/crates/hir-ty/src/lower.rs
index 9a61f15359..c8a85b4a9f 100644
--- a/crates/hir-ty/src/lower.rs
+++ b/crates/hir-ty/src/lower.rs

@@ -1383,51 +1383,50 @@ pub(crate) fn generic_predicates_for_param_query(

let ctx = TyLoweringContext::new(db, &resolver, def.into())

.with_type_param_mode(ParamLoweringMode::Variable);

let generics = generics(db.upcast(), def);

- let mut predicates: Vec<_> = resolver

- .where_predicates_in_scope()

- // we have to filter out all other predicates *first*, before attempting to lower them

- .filter(|pred| match pred {

- WherePredicate::ForLifetime { target, bound, .. }

- | WherePredicate::TypeBound { target, bound, .. } => {

- match target {

- WherePredicateTypeTarget::TypeRef(type_ref) => {

- if ctx.lower_ty_only_param(type_ref) != Some(param_id) {

- return false;

- }

- &WherePredicateTypeTarget::TypeOrConstParam(local_id) => {

- let target_id = TypeOrConstParamId { parent: def, local_id };

- if target_id != param_id {

- return false;

- }

- };

- match &**bound {

- TypeBound::ForLifetime(_, path) | TypeBound::Path(path, _) => {

- // Only lower the bound if the trait could possibly define the associated

- // type we're looking for.

+ // we have to filter out all other predicates *first*, before attempting to lower them

+ let predicate = |pred: &&_| match pred {

+ WherePredicate::ForLifetime { target, bound, .. }

+ | WherePredicate::TypeBound { target, bound, .. } => {

+ let invalid_target = match target {

+ WherePredicateTypeTarget::TypeRef(type_ref) => {

+ ctx.lower_ty_only_param(type_ref) != Some(param_id)

+ }

+ &WherePredicateTypeTarget::TypeOrConstParam(local_id) => {

+ let target_id = TypeOrConstParamId { parent: def, local_id };

+ target_id != param_id

+ }

+ };

+ if invalid_target {

+ return false;

+ }

+ match &**bound {

+ TypeBound::ForLifetime(_, path) | TypeBound::Path(path, _) => {

+ // Only lower the bound if the trait could possibly define the associated

+ // type we're looking for.

- let assoc_name = match &assoc_name {

- Some(it) => it,

- None => return true,

- };

- let tr = match resolver.resolve_path_in_type_ns_fully(db.upcast(), path) {

- Some(TypeNs::TraitId(tr)) => tr,

- _ => return false,

- };

+ let Some(assoc_name) = &assoc_name else { return true };

+ let Some(TypeNs::TraitId(tr)) =

+ resolver.resolve_path_in_type_ns_fully(db.upcast(), path)

+ else {

+ return false;

+ };

- all_super_traits(db.upcast(), tr).iter().any(|tr| {

- db.trait_data(*tr).items.iter().any(|(name, item)| {

- matches!(item, AssocItemId::TypeAliasId(_)) && name == assoc_name

- })

+ all_super_traits(db.upcast(), tr).iter().any(|tr| {

+ db.trait_data(*tr).items.iter().any(|(name, item)| {

+ matches!(item, AssocItemId::TypeAliasId(_)) && name == assoc_name

})

- }

- TypeBound::Lifetime(_) | TypeBound::Error => false,

+ })

}

+ TypeBound::Lifetime(_) | TypeBound::Error => false,

}

- WherePredicate::Lifetime { .. } => false,

- })

+ }

+ WherePredicate::Lifetime { .. } => false,

+ };

+ let mut predicates: Vec<_> = resolver

+ .where_predicates_in_scope()

+ .filter(predicate)

.flat_map(|pred| {

ctx.lower_where_predicate(pred, true).map(|p| make_binders(db, &generics, p))

})

@@ -1519,7 +1518,12 @@ pub(crate) fn trait_environment_query(

let env = chalk_ir::Environment::new(Interner).add_clauses(Interner, clauses);

- Arc::new(TraitEnvironment { krate, block: None, traits_from_clauses: traits_in_scope, env })

+ Arc::new(TraitEnvironment {

+ krate,

+ block: None,

+ traits_from_clauses: traits_in_scope.into_boxed_slice(),

+ env,

+ })

}

/// Resolve the where clause(s) of an item with generics.

diff --git a/crates/hir-ty/src/tests/traits.rs b/crates/hir-ty/src/tests/traits.rs
index d36b885ec1..73016d38bb 100644
--- a/crates/hir-ty/src/tests/traits.rs
+++ b/crates/hir-ty/src/tests/traits.rs

@@ -4439,42 +4439,42 @@ fn test(v: S<i32>) {

fn associated_type_in_argument() {

check(

r#"

- trait A {

- fn m(&self) -> i32;

- }

+trait A {

+ fn m(&self) -> i32;

- fn x<T: B>(k: &<T as B>::Ty) {

- k.m();

- }

+fn x<T: B>(k: &<T as B>::Ty) {

+ k.m();

- struct X;

- struct Y;

+struct X;

+struct Y;

- impl A for X {

- fn m(&self) -> i32 {

- 8

- }

+impl A for X {

+ fn m(&self) -> i32 {

+ 8

}

- impl A for Y {

- fn m(&self) -> i32 {

- 32

- }

+impl A for Y {

+ fn m(&self) -> i32 {

+ 32

}

- trait B {

- type Ty: A;

- }

+trait B {

+ type Ty: A;

- impl B for u16 {

- type Ty = X;

- }

+impl B for u16 {

+ type Ty = X;

- fn ttt() {

- let inp = Y;

- x::<u16>(&inp);

- //^^^^ expected &X, got &Y

- }

- "#,

+fn ttt() {

+ let inp = Y;

+ x::<u16>(&inp);

+ //^^^^ expected &X, got &Y

+"#,

);

}

diff --git a/crates/hir-ty/src/traits.rs b/crates/hir-ty/src/traits.rs
index 3c7cfbaed3..467b94a266 100644
--- a/crates/hir-ty/src/traits.rs
+++ b/crates/hir-ty/src/traits.rs

@@ -48,7 +48,7 @@ pub struct TraitEnvironment {

pub krate: CrateId,

pub block: Option<BlockId>,

// FIXME make this a BTreeMap

- pub(crate) traits_from_clauses: Vec<(Ty, TraitId)>,

+ pub(crate) traits_from_clauses: Box<[(Ty, TraitId)]>,

pub env: chalk_ir::Environment<Interner>,

}

@@ -57,7 +57,7 @@ impl TraitEnvironment {

TraitEnvironment {

krate,

block: None,

- traits_from_clauses: Vec::new(),

+ traits_from_clauses: Box::default(),

env: chalk_ir::Environment::new(Interner),

}

diff --git a/crates/hir/src/display.rs b/crates/hir/src/display.rs
index cf3ff62fc6..5847c8a9fb 100644
--- a/crates/hir/src/display.rs
+++ b/crates/hir/src/display.rs

@@ -616,7 +616,7 @@ impl HirDisplay for TypeAlias {

write_where_clause(def_id, f)?;

if !data.bounds.is_empty() {

f.write_str(": ")?;

- f.write_joined(&data.bounds, " + ")?;

+ f.write_joined(data.bounds.iter(), " + ")?;

}

if let Some(ty) = &data.type_ref {

f.write_str(" = ")?;

diff --git a/crates/ide-diagnostics/src/lib.rs b/crates/ide-diagnostics/src/lib.rs
index d8e37a848a..68d7e99b7b 100644
--- a/crates/ide-diagnostics/src/lib.rs
+++ b/crates/ide-diagnostics/src/lib.rs

@@ -301,9 +301,9 @@ pub fn diagnostics(

)

}));

- let parse = sema.parse(file_id);

+ let parse = parse.syntax_node();

- for node in parse.syntax().descendants() {

+ for node in parse.descendants() {

handlers::useless_braces::useless_braces(&mut res, file_id, &node);

handlers::field_shorthand::field_shorthand(&mut res, file_id, &node);

handlers::json_is_not_rust::json_in_items(&sema, &mut res, file_id, &node, config);

@@ -386,7 +386,7 @@ pub fn diagnostics(

handle_lint_attributes(

&ctx.sema,

- parse.syntax(),

+ &parse,

&mut rustc_stack,

&mut clippy_stack,

&mut diagnostics_of_range,

diff --git a/crates/test-utils/src/minicore.rs b/crates/test-utils/src/minicore.rs
index cc41d87f5d..f2ca9d82ed 100644
--- a/crates/test-utils/src/minicore.rs
+++ b/crates/test-utils/src/minicore.rs

@@ -44,7 +44,7 @@

//! panic: fmt

//! phantom_data:

//! pin:

-//! pointee:

+//! pointee: copy, send, sync, ord, hash, unpin

//! range:

//! result:

//! send: sized

@@ -54,6 +54,7 @@

//! sync: sized

//! transmute:

//! try: infallible

+//! unpin: sized

//! unsize: sized

#![rustc_coherence_is_core]

@@ -89,6 +90,11 @@ pub mod marker {

pub trait Unsize<T: ?Sized> {}

// endregion:unsize

+ // region:unpin

+ #[lang = "unpin"]

+ pub auto trait Unpin {}

+ // endregion:unpin

// region:copy

#[lang = "copy"]

pub trait Copy: Clone {}

@@ -387,9 +393,10 @@ pub mod ptr {

// region:pointee

#[lang = "pointee_trait"]

+ #[rustc_deny_explicit_impl(implement_via_object = false)]

pub trait Pointee {

#[lang = "metadata_type"]

- type Metadata;

+ type Metadata: Copy + Send + Sync + Ord + Hash + Unpin;

}

// endregion:pointee

// region:non_null