Move to Rust 1.83 (#211)

This PR updates the pinned Rust version to 1.83, and updates mmtk-core to mmtk/mmtk-core#1253. (cherry picked from commit 73e9c84) # Conflicts: # .github/mergify.yml # mmtk/Cargo.lock # mmtk/Cargo.toml
mmtk · Jan 6, 2025 · 098cc57 · 098cc57
1 parent a6f8cac
commit 098cc57
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -21,3 +21,17 @@ pull_request_rules:
         assignees:
           - "{{ author }}"
         label_conflicts: backport-conflicts
+<<<<<<< HEAD
+=======
+  - name: backport patches to dev
+    conditions:
+      - base=master
+      - label=backport-dev
+    actions:
+      backport:
+        branches:
+          - dev
+        assignees:
+          - "{{ author }}"
+        label_conflicts: backport-conflicts
+>>>>>>> 73e9c84 (Move to Rust 1.83 (#211))
diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock
diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
@@ -33,7 +33,11 @@ lazy_static = "1.1"
 # - change branch
 # - change repo name
 # But other changes including adding/removing whitespaces in commented lines may break the CI
+<<<<<<< HEAD
 mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "2e548e5912ec195cce8d12811902a8617c4143e2" }
+=======
+mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "ec745353a8de72b645613e0fef3ab7f5f1ad9bd1" }
+>>>>>>> 73e9c84 (Move to Rust 1.83 (#211))
 # Uncomment the following to build locally
 # mmtk = { path = "../repos/mmtk-core" }
 log = {version = "0.4", features = ["max_level_trace", "release_max_level_off"] }

diff --git a/mmtk/rust-toolchain b/mmtk/rust-toolchain
@@ -1 +1 @@
-1.77.0
+1.83.0