mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Inline AllocFnFactory kind field

Browse source
This commit is contained in:
bjorn3 2022-09-10 10:55:02 +00:00
parent f8d8ffa2eb
commit 79fa6ce7a1
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_builtin_macros/src/global_allocator.rs
View file

@ -40,8 +40,7 @@ pub fn expand(
// Generate a bunch of new items using the AllocFnFactory // Generate a bunch of new items using the AllocFnFactory
let span = ecx.with_def_site_ctxt(item.span); let span = ecx.with_def_site_ctxt(item.span);
let f = let f = AllocFnFactory { span, ty_span, global: item.ident, cx: ecx };
AllocFnFactory { span, ty_span, kind: AllocatorKind::Global, global: item.ident, cx: ecx };
// Generate item statements for the allocator methods. // Generate item statements for the allocator methods.
let stmts = ALLOCATOR_METHODS.iter().map(|method| f.allocator_fn(method)).collect(); let stmts = ALLOCATOR_METHODS.iter().map(|method| f.allocator_fn(method)).collect();
@ -63,7 +62,6 @@ pub fn expand(
struct AllocFnFactory<'a, 'b> { struct AllocFnFactory<'a, 'b> {
span: Span, span: Span,
ty_span: Span, ty_span: Span,
kind: AllocatorKind,
global: Ident, global: Ident,
cx: &'b ExtCtxt<'a>, cx: &'b ExtCtxt<'a>,
} }
@ -92,7 +90,7 @@ impl AllocFnFactory<'_, '_> {
})); }));
let item = self.cx.item( let item = self.cx.item(
self.span, self.span,
Ident::from_str_and_span(&self.kind.fn_name(method.name), self.span), Ident::from_str_and_span(&AllocatorKind::Global.fn_name(method.name), self.span),
self.attrs(), self.attrs(),
kind, kind,
); );