bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #126767 - compiler-errors:static-foreign-item, r=spastorino

Browse source 
`StaticForeignItem` and `StaticItem` are the same

The struct `StaticItem` and `StaticForeignItem` are the same, so remove `StaticForeignItem`. Having them be separate is unique to `static` items -- unlike `ForeignItemKind::{Fn,TyAlias}`, which use the normal AST item.

r? ``@spastorino`` or ``@oli-obk``
This commit is contained in:
Matthias Krüger 2024-06-21 09:12:37 +02:00 • committed by GitHub
commit f577d808b7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 10 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/rustc_resolve/src/def_collector.rs
View file

@ -217,12 +217,7 @@ impl<'a, 'b, 'tcx> visit::Visitor<'a> for DefCollector<'a, 'b, 'tcx> {
fn visit_foreign_item(&mut self, fi: &'a ForeignItem) {
let def_kind = match fi.kind {
ForeignItemKind::Static(box StaticForeignItem {
ty: _,
mutability,
expr: _,
safety,
}) => {
ForeignItemKind::Static(box StaticItem { ty: _, mutability, expr: _, safety }) => {
let safety = match safety {
ast::Safety::Unsafe(_) | ast::Safety::Default => hir::Safety::Unsafe,
ast::Safety::Safe(_) => hir::Safety::Safe,