Skip to content

Add sync module to rustc_data_structures - #46709

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

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

Conversation

@Zoxc

@ZoxcZoxc commented Dec 13, 2017

Copy link
Copy Markdown
Contributor

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
Comment threadsrc/librustc/Cargo.toml Outdated

@arielb1arielb1Dec 13, 2017

Copy link
Copy Markdown
Contributor

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

arielb1 commented Dec 13, 2017

Copy link
Copy Markdown
Contributor

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

@kennytmkennytm 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

Zoxc commented Dec 14, 2017

Copy link
Copy Markdown
ContributorAuthor

I added my owning_ref fork to a rustc_data_structures module.

@bors

bors commented Dec 14, 2017

Copy link
Copy Markdown
Collaborator

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

@arielb1

arielb1 commented Dec 14, 2017

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Dec 14, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit a52f7f5 has been approved by arielb1

@bors

bors commented Dec 15, 2017

Copy link
Copy Markdown
Collaborator

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

@Zoxc

Zoxc commented Dec 15, 2017

Copy link
Copy Markdown
ContributorAuthor

@bors r=arielb1

@bors

bors commented Dec 15, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit aa8ae60 has been approved by arielb1

@bors

bors commented Dec 16, 2017

Copy link
Copy Markdown
Collaborator

🔒 Merge conflict

@Zoxc

Zoxc commented Dec 16, 2017

Copy link
Copy Markdown
ContributorAuthor

@bors r=arielb1

@bors

bors commented Dec 16, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit cce4358 has been approved by arielb1

@bors

bors commented Dec 16, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit cce43587ea99c1bea5d589fb2aabb1f101de4f1b with merge 3e5953b93d6c67645174e6f5bed9374f796b5707...

@bors

bors commented Dec 16, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@Zoxc

Zoxc commented Dec 16, 2017

Copy link
Copy Markdown
ContributorAuthor

@bors r=arielb1

@bors

bors commented Dec 16, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 0521aa8 has been approved by arielb1

@kennytmkennytm 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

bors commented Dec 16, 2017

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Dec 16, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@Zoxc

Zoxc commented Dec 16, 2017

Copy link
Copy Markdown
ContributorAuthor

@bors r=arielb1

@bors

bors commented Dec 16, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit c1e2814 has been approved by arielb1

@bors

bors commented Dec 16, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit c1e2814aceca0c2cc67c03744824cfa538255d77 with merge d7fb84e2fedf2c2f2901e07cdefabe18026ffc42...

@bors

bors commented Dec 16, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@kennytm

kennytm commented Dec 17, 2017•
edited
Loading

Copy link
Copy Markdown
Member

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

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

@kennytmkennytm 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

Zoxc commented Dec 17, 2017

Copy link
Copy Markdown
ContributorAuthor

@bors r=arielb1

@bors

bors commented Dec 17, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 970c613 has been approved by arielb1

@bors

bors commented Dec 17, 2017

Copy link
Copy Markdown
Collaborator

⌛ 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

bors commented Dec 17, 2017

Copy link
Copy Markdown
Collaborator

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

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

Reviewers

1 more reviewer
@arielb1arielb1arielb1 left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@arielb1arielb1

Labels

S-waiting-on-authorStatus: 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