2021 week 26: rebase off upstream #247

Activity

1. adpaco

   added

   Area: build

   Z-Sync UpstreamFetch changes from rustc repository. Old RebaseFetch changes from rustc repository. Old Rebase

   on Jun 22, 2021
2. adpaco

   self-assigned this

   on Jun 22, 2021
3. adpaco commented on Jun 30, 2021

   

   adpaco

   on Jun 30, 2021

   ContributorAuthor

   More actions

   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.
4. adpaco commented on Jun 30, 2021

   

   adpaco

   on Jun 30, 2021

   ContributorAuthor

   More actions

   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.
5. adpaco commented on Jul 2, 2021

   

   adpaco

   on Jul 2, 2021

   ContributorAuthor

   More actions

   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.
6. adpaco commented on Jul 2, 2021

   

   adpaco

   on Jul 2, 2021

   Last edited by adpaco

   ContributorAuthor

   More actions

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

   closed this as completedon Jul 6, 2021