Make Mmapper a struct, and existing impls storages

src/mmtk.rs

@@ -48,7 +48,7 @@ lazy_static! {
     pub static ref VM_MAP: Box<dyn VMMap + Send + Sync> = layout::create_vm_map();
 
     /// A global Mmapper for mmaping and protection of virtual memory.
-    pub static ref MMAPPER: Box<dyn Mmapper + Send + Sync> = layout::create_mmapper();
+    pub static ref MMAPPER: Box<Mmapper> = layout::create_mmapper();
 }
 
 use crate::util::rust_util::InitializeOnce;

src/plan/global.rs

@@ -377,7 +377,7 @@ pub struct BasePlan<VM: VMBinding> {
 /// is passed to each plan's constructor.
 pub struct CreateGeneralPlanArgs<'a, VM: VMBinding> {
     pub vm_map: &'static dyn VMMap,
-    pub mmapper: &'static dyn Mmapper,
+    pub mmapper: &'static Mmapper,
     pub options: Arc<Options>,
     pub state: Arc<GlobalState>,
     pub gc_trigger: Arc<crate::util::heap::gc_trigger::GCTrigger<VM>>,

src/policy/space.rs

@@ -517,7 +517,7 @@ pub struct CommonSpace<VM: VMBinding> {
     pub extent: usize,
 
     pub vm_map: &'static dyn VMMap,
-    pub mmapper: &'static dyn Mmapper,
+    pub mmapper: &'static Mmapper,
 
     pub(crate) metadata: SideMetadataContext,
 
@@ -551,7 +551,7 @@ pub struct PlanCreateSpaceArgs<'a, VM: VMBinding> {
     pub vmrequest: VMRequest,
     pub global_side_metadata_specs: Vec<SideMetadataSpec>,
     pub vm_map: &'static dyn VMMap,
-    pub mmapper: &'static dyn Mmapper,
+    pub mmapper: &'static Mmapper,
     pub heap: &'a mut HeapMeta,
     pub constraints: &'a PlanConstraints,
     pub gc_trigger: Arc<GCTrigger<VM>>,