Skip to content

Move to Rust 1.83 (backport #211) #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 9, 2025
Merged

Move to Rust 1.83 (backport #211) #214

merged 3 commits into from
Jan 9, 2025

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 6, 2025

This PR updates the pinned Rust version to 1.83, and updates mmtk-core to mmtk/mmtk-core#1253.


This is an automatic backport of pull request #211 done by Mergify.

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
@mergify mergify bot added the conflicts label Jan 6, 2025
Copy link
Author

mergify bot commented Jan 6, 2025

Cherry-pick of 73e9c84 has failed:

On branch mergify/bp/dev/pr-211
Your branch is up to date with 'origin/dev'.

You are currently cherry-picking commit 73e9c84.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   mmtk/rust-toolchain

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both added:      .github/mergify.yml
	both modified:   mmtk/Cargo.lock
	both modified:   mmtk/Cargo.toml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request Jan 6, 2025
@qinsoon qinsoon requested a review from udesou January 7, 2025 23:39
Copy link
Contributor

@udesou udesou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@qinsoon qinsoon enabled auto-merge (squash) January 8, 2025 00:12
@qinsoon qinsoon merged commit b8ecd82 into dev Jan 9, 2025
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants