Move to Rust 1.83

.github/mergify.yml

@@ -0,0 +1,34 @@
+pull_request_rules:
+  - name: backport patches to v1.8.2+RAI
+    conditions:
+      - base=master
+      - label=backport-v1.8.2+RAI
+    actions:
+      backport:
+        branches:
+          - v1.8.2+RAI
+        assignees:
+          - "{{ author }}"
+        label_conflicts: backport-conflicts
+  - name: backport patches to v1.9.2+RAI
+    conditions:
+      - base=master
+      - label=backport-v1.9.2+RAI
+    actions:
+      backport:
+        branches:
+          - v1.9.2+RAI
+        assignees:
+          - "{{ author }}"
+        label_conflicts: backport-conflicts
+  - name: backport patches to dev
+    conditions:
+      - base=master
+      - label=backport-dev
+    actions:
+      backport:
+        branches:
+          - dev
+        assignees:
+          - "{{ author }}"
+        label_conflicts: backport-conflicts

Makefile

@@ -50,7 +50,6 @@ julia-debug:
 # Clean up the build artifacts
 clean:
 	@echo "Cleaning up build artifacts in $(JULIA_PATH) and $(MMTK_JULIA_DIR)";
-	@cd $(JULIA_PATH) && make clean
 	@cd $(MMTK_JULIA_DIR)mmtk && cargo clean
 
 .PHONY: release debug julia julia-debug clean

mmtk/Cargo.toml

@@ -27,7 +27,7 @@ lazy_static = "1.1"
 # - change branch
 # - change repo name
 # But other changes including adding/removing whitespaces in commented lines may break the CI
-mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "c0f97884234b51b13c8ba5d1563a8e0f592d11c2" }
+mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "ac80c8de8ac551959839dfaa79e87c1a05a9e89c" }
 # Uncomment the following to build locally
 # mmtk = { path = "../repos/mmtk-core" }
 log = {version = "0.4", features = ["max_level_trace", "release_max_level_off"] }

mmtk/build.rs

@@ -44,48 +44,50 @@ fn main() {
             .expect("failed to execute process");
     }
 
-    let bindings = bindgen::Builder::default()
-        .header(format!("{}/src/julia.h", julia_dir))
-        .header(format!("{}/src/julia_internal.h", julia_dir))
-        // Including the paths to depending .h files
-        .clang_arg("-I")
-        .clang_arg(format!("{}/mmtk/api", mmtk_dir))
-        .clang_arg("-I")
-        .clang_arg(format!("{}/src", julia_dir))
-        .clang_arg("-I")
-        .clang_arg(format!("{}/src/support", julia_dir))
-        .clang_arg("-I")
-        .clang_arg(format!("{}/usr/include", buildroot_dir))
-        // all types that we generate bindings from
-        .allowlist_item("jl_datatype_layout_t")
-        .allowlist_item("jl_ucontext_t")
-        .allowlist_item("jl_small_typeof_tags")
-        .allowlist_item("jl_*_tag")
-        .allowlist_item("jl_svec_t")
-        .allowlist_item("jl_module_t")
-        .allowlist_item("jl_task_t")
-        .allowlist_item("jl_datatype_t")
-        .allowlist_item("jl_weakref_t")
-        .allowlist_item("jl_binding_partition_t")
-        .allowlist_item("jl_bt_element_t")
-        .allowlist_item("jl_taggedvalue_t")
-        .allowlist_item("MMTkMutatorContext")
-        // --opaque-type MMTkMutatorContext
-        .opaque_type("MMTkMutatorContext")
-        // compile using c++
-        .clang_arg("-x")
-        .clang_arg("c++")
-        .clang_arg("-std=c++14")
-        // using MMTK types
-        .clang_arg("-DMMTK_GC")
-        // Finish the builder and generate the bindings.
-        .generate()
-        // Unwrap the Result and panic on failure.
-        .expect("Unable to generate bindings");
+    if !Path::new(format!("{}/mmtk/src/julia_types.rs", mmtk_dir).as_str()).exists() {
+        let bindings = bindgen::Builder::default()
+            .header(format!("{}/src/julia.h", julia_dir))
+            .header(format!("{}/src/julia_internal.h", julia_dir))
+            // Including the paths to depending .h files
+            .clang_arg("-I")
+            .clang_arg(format!("{}/mmtk/api", mmtk_dir))
+            .clang_arg("-I")
+            .clang_arg(format!("{}/src", julia_dir))
+            .clang_arg("-I")
+            .clang_arg(format!("{}/src/support", julia_dir))
+            .clang_arg("-I")
+            .clang_arg(format!("{}/usr/include", buildroot_dir))
+            // all types that we generate bindings from
+            .allowlist_item("jl_datatype_layout_t")
+            .allowlist_item("jl_ucontext_t")
+            .allowlist_item("jl_small_typeof_tags")
+            .allowlist_item("jl_*_tag")
+            .allowlist_item("jl_svec_t")
+            .allowlist_item("jl_module_t")
+            .allowlist_item("jl_task_t")
+            .allowlist_item("jl_datatype_t")
+            .allowlist_item("jl_weakref_t")
+            .allowlist_item("jl_binding_partition_t")
+            .allowlist_item("jl_bt_element_t")
+            .allowlist_item("jl_taggedvalue_t")
+            .allowlist_item("MMTkMutatorContext")
+            // --opaque-type MMTkMutatorContext
+            .opaque_type("MMTkMutatorContext")
+            // compile using c++
+            .clang_arg("-x")
+            .clang_arg("c++")
+            .clang_arg("-std=c++14")
+            // using MMTK types
+            .clang_arg("-DMMTK_GC")
+            // Finish the builder and generate the bindings.
+            .generate()
+            // Unwrap the Result and panic on failure.
+            .expect("Unable to generate bindings");
 
-    bindings
-        .write_to_file("src/julia_types.rs")
-        .expect("Couldn't write bindings!");
+        bindings
+            .write_to_file("src/julia_types.rs")
+            .expect("Couldn't write bindings!");
+    }
 
     built::write_built_file().expect("Failed to acquire build-time information");
 }

mmtk/rust-toolchain

@@ -1 +1 @@
-1.77.0
+1.83.0