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.

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

2021 week 26: rebase off upstream #247

Closed
adpaco-aws opened this issue Jun 22, 2021 · 4 comments
Closed

2021 week 26: rebase off upstream #247

adpaco-aws opened this issue Jun 22, 2021 · 4 comments
Assignees
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 22, 2021
@adpaco-aws adpaco-aws self-assigned this Jun 22, 2021
@adpaco-aws
Copy link
Contributor Author

While rebasing we get a conflict with one of the issue templates: .github/ISSUE_TEMPLATE/library_tracking_issue.md
Action taken: Remove that file.

Then we get another conflict in src/tools/compiletest/src/header.rs, where a call to iter_header uses different arguments (we edited this function in #168). Action taken: Replace old call with new one.

@adpaco-aws
Copy link
Contributor Author

The previous action did not work. It seems like this commit has changed the way in which tests are marked as "ignored" (this was done in the from_reader impl. of EarlyProps) so I will have to figure out the best way to do this for RMC.

@adpaco-aws
Copy link
Contributor Author

Tried again.

This time, I have accepted the changes in the from_reader impl. of EarlyProps. This removed a change we made in #168 that marked tests as "to-ignore" based on their name. I added an equivalent change in that same commit. Then continued the rebase without any more problems.

@adpaco-aws
Copy link
Contributor Author

adpaco-aws commented Jul 2, 2021

The regression completes successfully. Candidate branch is main-153-2021-07-02.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Z-Sync Upstream Fetch changes from rustc repository. Old Rebase
Projects
None yet
Development

No branches or pull requests

1 participant