Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-05-29 20:46:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix code_model::Type::walk not walking all types

Browse Source
This commit is contained in:
Lukas Wirth
2021-02-28 19:46:59 +01:00
parent a3f5491a1a
commit faf2dd49e4
3 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/hir/src/code_model.rs
+7 -7
View File
@@ -1924,21 +1924,18 @@ fn walk_bounds(
fn walk_type(db: &dyn HirDatabase, type_: &Type, cb: &mut impl FnMut(Type)) {
let ty = type_.ty.value.strip_references();
match ty {
Ty::Adt(_, parameters) => {
Ty::Adt(..) => {
cb(type_.derived(ty.clone()));
walk_substs(db, type_, parameters, cb);
}
Ty::AssociatedType(_, parameters) => {
Ty::AssociatedType(..) => {
if let Some(_) = ty.associated_type_parent_trait(db) {
cb(type_.derived(ty.clone()));
}
walk_substs(db, type_, parameters, cb);
}
Ty::OpaqueType(_, parameters) => {
Ty::OpaqueType(..) => {
if let Some(bounds) = ty.impl_trait_bounds(db) {
walk_bounds(db, &type_.derived(ty.clone()), &bounds, cb);
}
walk_substs(db, type_, parameters, cb);
}
Ty::Opaque(opaque_ty) => {
if let Some(bounds) = ty.impl_trait_bounds(db) {
@@ -1956,7 +1953,10 @@ fn walk_type(db: &dyn HirDatabase, type_: &Type, cb: &mut impl FnMut(Type)) {
walk_bounds(db, &type_.derived(ty.clone()), bounds.as_ref(), cb);
}
_ => (),
_ => {}
}
if let Some(substs) = ty.substs() {
walk_substs(db, type_, &substs, cb);
}
}
crates/hir_ty/src/display.rs
+14 -13
View File
@@ -341,11 +341,12 @@ fn hir_fmt(&self, f: &mut HirFormatter) -> Result<(), HirDisplayError> {
write!(f, ")")?;
}
}
&Ty::FnPtr { is_varargs, ref substs, .. } => {
let sig = FnSig::from_fn_ptr_substs(&substs, is_varargs);
Ty::FnPtr { is_varargs, substs, .. } => {
let sig = FnSig::from_fn_ptr_substs(&substs, *is_varargs);
sig.hir_fmt(f)?;
}
&Ty::FnDef(def, ref parameters) => {
Ty::FnDef(def, parameters) => {
let def = *def;
let sig = f.db.callable_item_signature(def).subst(parameters);
match def {
CallableDefId::FunctionId(ff) => {
@@ -383,10 +384,10 @@ fn hir_fmt(&self, f: &mut HirFormatter) -> Result<(), HirDisplayError> {
write!(f, " -> {}", ret_display)?;
}
}
&Ty::Adt(def_id, ref parameters) => {
Ty::Adt(def_id, parameters) => {
match f.display_target {
DisplayTarget::Diagnostics | DisplayTarget::Test => {
let name = match def_id {
let name = match *def_id {
AdtId::StructId(it) => f.db.struct_data(it).name.clone(),
AdtId::UnionId(it) => f.db.union_data(it).name.clone(),
AdtId::EnumId(it) => f.db.enum_data(it).name.clone(),
@@ -396,7 +397,7 @@ fn hir_fmt(&self, f: &mut HirFormatter) -> Result<(), HirDisplayError> {
DisplayTarget::SourceCode { module_id } => {
if let Some(path) = find_path::find_path(
f.db.upcast(),
ItemInNs::Types(def_id.into()),
ItemInNs::Types((*def_id).into()),
module_id,
) {
write!(f, "{}", path)?;
@@ -447,13 +448,13 @@ fn hir_fmt(&self, f: &mut HirFormatter) -> Result<(), HirDisplayError> {
}
}
}
&Ty::AssociatedType(type_alias, ref parameters) => {
Ty::AssociatedType(type_alias, parameters) => {
let trait_ = match type_alias.lookup(f.db.upcast()).container {
AssocContainerId::TraitId(it) => it,
_ => panic!("not an associated type"),
};
let trait_ = f.db.trait_data(trait_);
let type_alias_data = f.db.type_alias_data(type_alias);
let type_alias_data = f.db.type_alias_data(*type_alias);
// Use placeholder associated types when the target is test (https://rust-lang.github.io/chalk/book/clauses/type_equality.html#placeholder-associated-types)
if f.display_target.is_test() {
@@ -465,13 +466,13 @@ fn hir_fmt(&self, f: &mut HirFormatter) -> Result<(), HirDisplayError> {
}
} else {
let projection_ty =
ProjectionTy { associated_ty: type_alias, parameters: parameters.clone() };
ProjectionTy { associated_ty: *type_alias, parameters: parameters.clone() };
projection_ty.hir_fmt(f)?;
}
}
&Ty::ForeignType(type_alias, ref parameters) => {
let type_alias = f.db.type_alias_data(type_alias);
Ty::ForeignType(type_alias, parameters) => {
let type_alias = f.db.type_alias_data(*type_alias);
write!(f, "{}", type_alias.name)?;
if parameters.len() > 0 {
write!(f, "<")?;
@@ -479,9 +480,9 @@ fn hir_fmt(&self, f: &mut HirFormatter) -> Result<(), HirDisplayError> {
write!(f, ">")?;
}
}
&Ty::OpaqueType(opaque_ty_id, ref parameters) => {
Ty::OpaqueType(opaque_ty_id, parameters) => {
match opaque_ty_id {
OpaqueTyId::ReturnTypeImplTrait(func, idx) => {
&OpaqueTyId::ReturnTypeImplTrait(func, idx) => {
let datas =
f.db.return_type_impl_traits(func).expect("impl trait id without data");
let data = (*datas)
crates/hir_ty/src/lib.rs
+4 -6
View File
@@ -726,11 +726,11 @@ pub fn as_fn_def(&self) -> Option<FunctionId> {
pub fn callable_sig(&self, db: &dyn HirDatabase) -> Option<FnSig> {
match self {
&Ty::FnPtr { is_varargs, substs: ref parameters, .. } => {
Some(FnSig::from_fn_ptr_substs(&parameters, is_varargs))
Ty::FnPtr { is_varargs, substs: parameters, .. } => {
Some(FnSig::from_fn_ptr_substs(&parameters, *is_varargs))
}
&Ty::FnDef(def, ref parameters) => {
let sig = db.callable_item_signature(def);
Ty::FnDef(def, parameters) => {
let sig = db.callable_item_signature(*def);
Some(sig.subst(&parameters))
}
Ty::Closure { substs: parameters, .. } => {
@@ -783,7 +783,6 @@ pub fn substs(&self) -> Option<&Substs> {
| Ty::AssociatedType(_, substs)
| Ty::ForeignType(_, substs)
| Ty::Closure { substs, .. } => Some(substs),
_ => None,
}
}
@@ -802,7 +801,6 @@ pub fn substs_mut(&mut self) -> Option<&mut Substs> {
| Ty::AssociatedType(_, substs)
| Ty::ForeignType(_, substs)
| Ty::Closure { substs, .. } => Some(substs),
_ => None,
}
}