mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #124524 - spastorino:make-foreign-static-use-struct, r=oli-obk

Browse Source 
Add StaticForeignItem and use it on ForeignItemKind

This is in preparation for unsafe extern blocks that adds a safe variant for functions inside extern blocks.

r? `@oli-obk`
cc `@compiler-errors`
This commit is contained in:
Matthias Krüger 2024-04-30 06:43:42 +02:00 committed by GitHub
commit 27d320d1b6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/items.rs
View File

@ -3325,11 +3325,11 @@ fn rewrite(&self, context: &RewriteContext<'_>, shape: Shape) -> Option<String>
.map(|(s, _, _)| format!("{};", s)) .map(|(s, _, _)| format!("{};", s))
} }
} }
ast::ForeignItemKind::Static(ref ty, mutability, _) => { ast::ForeignItemKind::Static(ref static_foreign_item) => {
// FIXME(#21): we're dropping potential comments in between the // FIXME(#21): we're dropping potential comments in between the
// function kw here. // function kw here.
let vis = format_visibility(context, &self.vis); let vis = format_visibility(context, &self.vis);
let mut_str = format_mutability(mutability); let mut_str = format_mutability(static_foreign_item.mutability);
let prefix = format!( let prefix = format!(
"{}static {}{}:", "{}static {}{}:",
vis, vis,
@ -3340,7 +3340,7 @@ fn rewrite(&self, context: &RewriteContext<'_>, shape: Shape) -> Option<String>
rewrite_assign_rhs( rewrite_assign_rhs(
context, context,
prefix, prefix,
&**ty, &static_foreign_item.ty,
&RhsAssignKind::Ty, &RhsAssignKind::Ty,
shape.sub_width(1)?, shape.sub_width(1)?,
) )