diff --git a/Cargo.toml b/Cargo.toml index 9fa74fa2f7..52d7946206 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ repository = "https://github.com/mmtk/mmtk-core" readme = "README.md" categories = ["memory-management"] keywords = ["gc", "garbage", "collection", "garbage-collection", "allocation"] -rust-version = "1.71.1" +rust-version = "1.74.1" build = "build.rs" [lib] @@ -25,12 +25,12 @@ atomic-traits = "0.4.0" bytemuck = { version = "1.14.0", features = ["derive"] } cfg-if = "1.0" crossbeam = "0.8.1" -delegate = "0.12.0" -downcast-rs = "1.1.1" +delegate = "0.13.2" +downcast-rs = "2.0.1" enum-map = "2.4.2" env_logger = { version = "0.11.3", optional = true } is-terminal = "0.4.7" -itertools = "0.12.0" +itertools = "0.14.0" jemalloc-sys = { version = "0.5.3", features = ["disable_initial_exec_tls"], optional = true } lazy_static = "1.1" libc = "0.2" @@ -48,18 +48,18 @@ regex = "1.7.0" rustversion = "1.0" spin = "0.9.5" static_assertions = "1.1.0" -strum = "0.26.2" -strum_macros = "0.26.2" -sysinfo = "0.30.9" +strum = "0.27.1" +strum_macros = "0.27.1" +sysinfo = "0.33.1" [dev-dependencies] paste = "1.0.8" -rand = "0.8.5" -rand_chacha = "0.3.1" -criterion = "0.4" +rand = "0.9.0" +rand_chacha = "0.9.0" +criterion = "0.5" [build-dependencies] -built = { version = "0.7.1", features = ["git2"] } +built = { version = "0.7.7", features = ["git2"] } [[bench]] name = "main" diff --git a/src/build_info.rs b/src/build_info.rs index 16a229ab9f..a0f31b0e98 100644 --- a/src/build_info.rs +++ b/src/build_info.rs @@ -7,10 +7,10 @@ mod raw { } /// MMTk crate version such as 0.14.0 -pub const MMTK_PKG_VERSION: &str = raw::PKG_VERSION; +pub use raw::PKG_VERSION as MMTK_PKG_VERSION; /// Comma separated features enabled for this build -pub const MMTK_FEATURES: &str = raw::FEATURES_STR; +pub use raw::FEATURES_STR as MMTK_FEATURES; lazy_static! { /// Git version as short commit hash, such as a96e8f9, or a96e8f9-dirty, or unknown-git-version if MMTk diff --git a/src/policy/marksweepspace/native_ms/block_list.rs b/src/policy/marksweepspace/native_ms/block_list.rs index 944a45ba54..693d078e02 100644 --- a/src/policy/marksweepspace/native_ms/block_list.rs +++ b/src/policy/marksweepspace/native_ms/block_list.rs @@ -310,7 +310,7 @@ pub(crate) fn pages_used_by_blocklists(lists: &BlockLists) -> usize { /// i.e. byte size == `wsize*sizeof(void*)` /// adapted from _mi_wsize_from_size in mimalloc fn mi_wsize_from_size(size: usize) -> usize { - (size + MI_INTPTR_SIZE - 1) / MI_INTPTR_SIZE + size.div_ceil(MI_INTPTR_SIZE) } pub fn mi_bin(size: usize, align: usize) -> usize { diff --git a/src/util/memory.rs b/src/util/memory.rs index d79905b759..9a9d4d16dc 100644 --- a/src/util/memory.rs +++ b/src/util/memory.rs @@ -465,7 +465,7 @@ pub(crate) fn get_system_total_memory() -> u64 { // `Options`. If we only load memory-related components on start-up, it should only take <1ms // to initialize the `System` instance. let sys = System::new_with_specifics( - RefreshKind::new().with_memory(MemoryRefreshKind::new().with_ram()), + RefreshKind::nothing().with_memory(MemoryRefreshKind::nothing().with_ram()), ); sys.total_memory() }