Use static types instead of trait objects in axdriver

equation314 · equation314 · commit 4385085aec86 · 2023-02-14T01:21:56.000+08:00
diff --git a/src/lib.rs b/src/lib.rs
@@ -107,10 +107,10 @@ unsafe impl GlobalAlloc for GlobalAllocator {
     }
 }
 
-#[cfg_attr(not(test), global_allocator)]
-static GLOBAL_ALLOCATOR: GlobalAllocator = GlobalAllocator::new();
+#[cfg_attr(all(target_os = "none", not(test)), global_allocator)]
+pub static GLOBAL_ALLOCATOR: GlobalAllocator = GlobalAllocator::new();
 
-#[cfg(not(test))]
+#[cfg(all(target_os = "none", not(test)))]
 #[alloc_error_handler]
 fn handle_alloc_error(layout: Layout) -> ! {
     panic!(

Original file line number	Diff line number	Diff line change
`@@ -107,10 +107,10 @@ unsafe impl GlobalAlloc for GlobalAllocator {`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
`110`		`-#[cfg_attr(not(test), global_allocator)]`
`111`		`-static GLOBAL_ALLOCATOR: GlobalAllocator = GlobalAllocator::new();`
	`110`	`+#[cfg_attr(all(target_os = "none", not(test)), global_allocator)]`
	`111`	`+pub static GLOBAL_ALLOCATOR: GlobalAllocator = GlobalAllocator::new();`
`112`	`112`
`113`		`-#[cfg(not(test))]`
	`113`	`+#[cfg(all(target_os = "none", not(test)))]`
`114`	`114`	`#[alloc_error_handler]`
`115`	`115`	`fn handle_alloc_error(layout: Layout) -> ! {`
`116`	`116`	`panic!(`