Skip to content

Add sync module to rustc_data_structures#46709

Merged
bors merged 1 commit intorust-lang:masterfrom
Zoxc:par-merge
Dec 17, 2017
Merged

Add sync module to rustc_data_structures#46709
bors merged 1 commit intorust-lang:masterfrom
Zoxc:par-merge

Conversation

@Zoxc
Copy link
Contributor

@Zoxc Zoxc commented Dec 13, 2017

This PR is split out from #45912, since github apparently can't handle such large PRs.

r? @arielb1

arielb1
arielb1 reviewed Dec 13, 2017
View reviewed changes
src/librustc/Cargo.toml Outdated
Copy link
Contributor

@arielb1 arielb1 Dec 13, 2017

Choose a reason for hiding this comment

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

the rustc build process shouldn't depend on random git repos - that's just too fragile. We want to keep things building in N years.

@arielb1
Copy link
Contributor

arielb1 commented Dec 13, 2017

r=me if you (temporarily) vendor your version of owning_ref into the rustc repo

@kennytm kennytm added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Dec 13, 2017
@Zoxc
Copy link
Contributor Author

Zoxc commented Dec 14, 2017

I added my owning_ref fork to a rustc_data_structures module.

@bors
Copy link
Collaborator

bors commented Dec 14, 2017

☔ The latest upstream changes (presumably #45002) made this pull request unmergeable. Please resolve the merge conflicts.

@arielb1
Copy link
Contributor

arielb1 commented Dec 14, 2017

@bors r+

@bors
Copy link
Collaborator

bors commented Dec 14, 2017

📌 Commit a52f7f5 has been approved by arielb1

@bors
Copy link
Collaborator

bors commented Dec 15, 2017

☔ The latest upstream changes (presumably #46740) made this pull request unmergeable. Please resolve the merge conflicts.

@Zoxc
Copy link
Contributor Author

Zoxc commented Dec 15, 2017

@bors r=arielb1

@bors
Copy link
Collaborator

bors commented Dec 15, 2017

📌 Commit aa8ae60 has been approved by arielb1

@bors
Copy link
Collaborator

bors commented Dec 16, 2017

🔒 Merge conflict

@Zoxc
Copy link
Contributor Author

Zoxc commented Dec 16, 2017

@bors r=arielb1

@bors
Copy link
Collaborator

bors commented Dec 16, 2017

📌 Commit cce4358 has been approved by arielb1

@bors
Copy link
Collaborator

bors commented Dec 16, 2017

⌛ Testing commit cce43587ea99c1bea5d589fb2aabb1f101de4f1b with merge 3e5953b93d6c67645174e6f5bed9374f796b5707...

@bors
Copy link
Collaborator

bors commented Dec 16, 2017

💔 Test failed - status-travis

@Zoxc
Copy link
Contributor Author

Zoxc commented Dec 16, 2017

@bors r=arielb1

@bors
Copy link
Collaborator

bors commented Dec 16, 2017

📌 Commit 0521aa8 has been approved by arielb1

@kennytm kennytm added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 16, 2017
@bors
Copy link
Collaborator

bors commented Dec 16, 2017

⌛ Testing commit 0521aa8518225e1859a2c3a45e803a9a8d957444 with merge 8d41516c6f5c1ad1b6205e2cb7fa26233b352ad3...

@bors
Copy link
Collaborator

bors commented Dec 16, 2017

💔 Test failed - status-travis

@Zoxc
Copy link
Contributor Author

Zoxc commented Dec 16, 2017

@bors r=arielb1

@bors
Copy link
Collaborator

bors commented Dec 16, 2017

📌 Commit c1e2814 has been approved by arielb1

@bors
Copy link
Collaborator

bors commented Dec 16, 2017

⌛ Testing commit c1e2814aceca0c2cc67c03744824cfa538255d77 with merge d7fb84e2fedf2c2f2901e07cdefabe18026ffc42...

@bors
Copy link
Collaborator

bors commented Dec 16, 2017

💔 Test failed - status-travis

@kennytm
Copy link
Member

kennytm commented Dec 17, 2017 •
edited
Loading

Please rebase on latest master to pick up the newest toolstate.

(BTW I don't think you need to update Cargo.lock)

@kennytm kennytm added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 17, 2017
@Zoxc
Copy link
Contributor Author

Zoxc commented Dec 17, 2017

@bors r=arielb1

@bors
Copy link
Collaborator

bors commented Dec 17, 2017

📌 Commit 970c613 has been approved by arielb1

@bors
Copy link
Collaborator

bors commented Dec 17, 2017

⌛ Testing commit 970c613 with merge af57ace...

bors added a commit that referenced this pull request Dec 17, 2017
@bors
Auto merge of #46709 - Zoxc:par-merge, r=arielb1
af57ace 
Add sync module to rustc_data_structures

This PR is split out from #45912, since github apparently can't handle such large PRs.

r? @arielb1
@bors
Copy link
Collaborator

bors commented Dec 17, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: arielb1
Pushing af57ace to master...

@bors bors merged commit 970c613 into rust-lang:master Dec 17, 2017
@bors bors mentioned this pull request Dec 17, 2017
Closed
@aturon aturon mentioned this pull request Aug 16, 2019
Open
37 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@arielb1 arielb1 arielb1 left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@arielb1 arielb1

Labels

S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Zoxc @arielb1 @bors @kennytm