Skip to content

Commit 098cc57

Browse files
qinsoonmergify[bot]
authored andcommitted
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
1 parent a6f8cac commit 098cc57

File tree

4 files changed

+30
-2
lines changed

4 files changed

+30
-2
lines changed

.github/mergify.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,17 @@ pull_request_rules:
2121
assignees:
2222
- "{{ author }}"
2323
label_conflicts: backport-conflicts
24+
<<<<<<< HEAD
25+
=======
26+
- name: backport patches to dev
27+
conditions:
28+
- base=master
29+
- label=backport-dev
30+
actions:
31+
backport:
32+
branches:
33+
- dev
34+
assignees:
35+
- "{{ author }}"
36+
label_conflicts: backport-conflicts
37+
>>>>>>> 73e9c84 (Move to Rust 1.83 (#211))

mmtk/Cargo.lock

Lines changed: 11 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mmtk/Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ lazy_static = "1.1"
3333
# - change branch
3434
# - change repo name
3535
# But other changes including adding/removing whitespaces in commented lines may break the CI
36+
<<<<<<< HEAD
3637
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "2e548e5912ec195cce8d12811902a8617c4143e2" }
38+
=======
39+
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "ec745353a8de72b645613e0fef3ab7f5f1ad9bd1" }
40+
>>>>>>> 73e9c84 (Move to Rust 1.83 (#211))
3741
# Uncomment the following to build locally
3842
# mmtk = { path = "../repos/mmtk-core" }
3943
log = {version = "0.4", features = ["max_level_trace", "release_max_level_off"] }

mmtk/rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.77.0
1+
1.83.0

0 commit comments

Comments
 (0)