Skip to content
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.

Sign up for GitHub

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

Jump to bottom

2021 week 23: rebase off upstream #175

Closed
adpaco-aws opened this issue Jun 7, 2021 · 3 comments
Closed

2021 week 23: rebase off upstream #175

adpaco-aws opened this issue Jun 7, 2021 · 3 comments
Assignees
@adpaco-aws
Labels
Z-Sync Upstream Fetch changes from rustc repository. Old Rebase

Comments

@adpaco-aws
Copy link
Contributor

No description provided.

@adpaco-aws adpaco-aws added Area: build Z-Sync Upstream Fetch changes from rustc repository. Old Rebase labels Jun 7, 2021
@adpaco-aws adpaco-aws self-assigned this Jun 7, 2021
@adpaco-aws
Copy link
Contributor Author

Merge conflict in compiler/rustc_interface/src/util.rs (where we redefine get_builtin_codegen_backend). Incoming change is empty so we keep our changes.

@adpaco-aws
Copy link
Contributor Author

That did not work. The get_builtin_codegen_backend function got removed in this commit and the backend match is now done in get_codegen_backend which we extend for the gotoc case.

These changes have taken place in compiler/rustc_interface/src/util.rs: Compare old and new commits.

@adpaco-aws
Copy link
Contributor Author

The new branch is main-152-2021-06-07

celinval pushed a commit to celinval/kani-dev that referenced this issue Nov 16, 2021
@workingjubilee
Merge pull request model-checking#175 from rust-lang/feature/more-act…
081240a 
…ions

Delete travis config, move tests to github actions.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@adpaco-aws adpaco-aws

Labels
Z-Sync Upstream Fetch changes from rustc repository. Old Rebase
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@adpaco-aws