bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Do not suggest struct literal when fields are private

Browse source
This commit is contained in:
Esteban Küber 2023-11-08 22:02:51 +00:00
parent e0e379b6fd
commit 12a8bb8d9b
2 changed files with 65 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

99
compiler/rustc_resolve/src/late/diagnostics.rs
View file

@ -1449,44 +1449,73 @@ impl<'a: 'ast, 'ast, 'tcx> LateResolutionVisitor<'a, '_, 'ast, 'tcx> {
), ),
_ => (": val", "literal", Applicability::HasPlaceholders, None), _ => (": val", "literal", Applicability::HasPlaceholders, None),
}; };
let field_ids = self.r.field_def_ids(def_id);
let (fields, applicability) = match field_ids {
Some(field_ids) => {
let fields = field_ids.iter().map(|&id| self.r.tcx.item_name(id));
let fields = if let Some(old_fields) = old_fields { let fields = match def_id.as_local() {
fields Some(def_id) => {
.enumerate() self.r.struct_constructors.get(&def_id).cloned().map(|(_, _, f)| f)
.map(|(idx, new)| (new, old_fields.get(idx)))
.map(|(new, old)| {
let new = new.to_ident_string();
if let Some(Some(old)) = old
&& new != *old
{
format!("{new}: {old}")
} else {
new
}
})
.collect::<Vec<String>>()
} else {
fields.map(|f| format!("{f}{tail}")).collect::<Vec<String>>()
};
(fields.join(", "), applicability)
} }
None => ("/* fields */".to_string(), Applicability::HasPlaceholders), None => Some(
self.r
.tcx
.associated_item_def_ids(def_id)
.iter()
.map(|field_id| self.r.tcx.visibility(field_id))
.collect(),
),
}; };
let pad = match field_ids {
Some(field_ids) if field_ids.is_empty() => "", let hidden_fields = fields.map_or(false, |fields| {
_ => " ", fields
}; .iter()
err.span_suggestion( .filter(|vis| {
span, !self.r.is_accessible_from(**vis, self.parent_scope.module)
format!("use struct {descr} syntax instead"), })
format!("{path_str} {{{pad}{fields}{pad}}}"), .next()
applicability, .is_some()
); });
if !hidden_fields {
// If the fields of the type are private, we shouldn't be suggesting using
// the struct literal syntax at all, as that will cause a subsequent error.
let field_ids = self.r.field_def_ids(def_id);
let (fields, applicability) = match field_ids {
Some(field_ids) => {
let fields = field_ids.iter().map(|&id| self.r.tcx.item_name(id));
let fields = if let Some(old_fields) = old_fields {
fields
.enumerate()
.map(|(idx, new)| (new, old_fields.get(idx)))
.map(|(new, old)| {
let new = new.to_ident_string();
if let Some(Some(old)) = old
&& new != *old
{
format!("{new}: {old}")
} else {
new
}
})
.collect::<Vec<String>>()
} else {
fields.map(|f| format!("{f}{tail}")).collect::<Vec<String>>()
};
(fields.join(", "), applicability)
}
None => ("/* fields */".to_string(), Applicability::HasPlaceholders),
};
let pad = match field_ids {
Some(field_ids) if field_ids.is_empty() => "",
_ => " ",
};
err.span_suggestion(
span,
format!("use struct {descr} syntax instead"),
format!("{path_str} {{{pad}{fields}{pad}}}"),
applicability,
);
}
} }
_ => { _ => {
err.span_label(span, fallback_label.to_string()); err.span_label(span, fallback_label.to_string());

2
tests/ui/xcrate/xcrate-unit-struct.stderr
View file

@ -13,7 +13,7 @@ error[E0423]: expected value, found struct `xcrate_unit_struct::StructWithPrivFi
--> $DIR/xcrate-unit-struct.rs:11:13 --> $DIR/xcrate-unit-struct.rs:11:13
| |
LL | let _ = xcrate_unit_struct::StructWithPrivFields; LL | let _ = xcrate_unit_struct::StructWithPrivFields;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use struct literal syntax instead: `xcrate_unit_struct::StructWithPrivFields { foo: val }` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
| |
::: $DIR/auxiliary/xcrate_unit_struct.rs:25:1 ::: $DIR/auxiliary/xcrate_unit_struct.rs:25:1
| |