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

Update crossbeam-channel to avoid UB #77819

Merged
merged 1 commit into from
Oct 12, 2020
Merged

Update crossbeam-channel to avoid UB #77819

merged 1 commit into from
Oct 12, 2020

Conversation

mati865
Copy link
Contributor

@mati865 mati865 commented Oct 11, 2020

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 11, 2020
@jyn514 jyn514 added I-unsound Issue: A soundness hole (worst kind of bug), see: https://en.wikipedia.org/wiki/Soundness T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 11, 2020
@rustbot rustbot added the I-prioritize Issue: Indicates that prioritization has been requested for this issue. label Oct 11, 2020
@jyn514
Copy link
Member

jyn514 commented Oct 11, 2020

The 0.4.3 update happened in 342d956, which is now on 1.47 stable.

@jyn514 jyn514 added beta-nominated Nominated for backporting to the compiler in the beta channel. stable-nominated Nominated for backporting to the compiler in the stable channel. labels Oct 11, 2020
@lcnr
Copy link
Contributor

lcnr commented Oct 11, 2020

Why are you updating Cargo.lock instead of Cargo.toml?

@mati865
Copy link
Contributor Author

mati865 commented Oct 11, 2020

@lcnr it's pulled by RLS.

Stable nomination seems like an overkill because corssbeam_channel::bounded seems to only be used by RLS. For beta it'd be nice to ship official binaries without UB.

@jyn514 jyn514 removed the stable-nominated Nominated for backporting to the compiler in the stable channel. label Oct 11, 2020
@Mark-Simulacrum
Copy link
Member

I am a bit worried that without a Cargo.toml update forcing this we'll end up accidentally going back to the old state; can you submit a PR to RLS updating it's toml as well?

@bors r+ though

@bors
Copy link
Contributor

bors commented Oct 11, 2020

📌 Commit 6fd8ac011f97ca5e4ad3e6b2529cef15f99bcb26 has been approved by Mark-Simulacrum

@bors bors 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-review Status: Awaiting review from the assignee but also interested parties. labels Oct 11, 2020
@mati865
Copy link
Contributor Author

mati865 commented Oct 11, 2020

Sure, I'll do that soon.

@mati865 mati865 mentioned this pull request Oct 11, 2020
Merged
@LeSeulArtichaut LeSeulArtichaut removed the I-prioritize Issue: Indicates that prioritization has been requested for this issue. label Oct 11, 2020
@bors

This comment has been minimized.

Sign in to view
@bors bors 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 Oct 11, 2020
@mati865
Copy link
Contributor Author

mati865 commented Oct 11, 2020

@rustbot modify labels: -S-waiting-on-author +S-waiting-on-review

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 11, 2020
@jyn514
Copy link
Member

jyn514 commented Oct 11, 2020

@bors r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Oct 11, 2020

📌 Commit 5aa6617 has been approved by Mark-Simulacrum

@bors bors 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-review Status: Awaiting review from the assignee but also interested parties. labels Oct 11, 2020
@Dylan-DPC-zz
Copy link

prioritising it to avoid catching conflicts

@bors p=1

@bors
Copy link
Contributor

bors commented Oct 12, 2020

⌛ Testing commit 5aa6617 with merge 63962f0...

@bors
Copy link
Contributor

bors commented Oct 12, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: Mark-Simulacrum
Pushing 63962f0 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 12, 2020
@bors bors merged commit 63962f0 into rust-lang:master Oct 12, 2020
@rustbot rustbot added this to the 1.49.0 milestone Oct 12, 2020
@mati865 mati865 deleted the crossbeam-ub branch October 12, 2020 06:24
@Xanewok Xanewok mentioned this pull request Oct 12, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 12, 2020
@bors
Auto merge of rust-lang#77847 - Xanewok:update-rls, r=Xanewok
8dae8cd 
Update RLS

cc rust-lang#77819
Fixes rust-lang#77810

r? `@ghost`
@spastorino
Copy link
Member

discussed in T-compiler meeting.

@rustbot modify labels: beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Oct 15, 2020
@pietroalbini pietroalbini mentioned this pull request Oct 20, 2020
Merged
@pietroalbini pietroalbini modified the milestones: 1.49.0, 1.48.0 Oct 20, 2020
@pietroalbini pietroalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 20, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 20, 2020
@bors
Auto merge of rust-lang#78141 - pietroalbini:beta-rollup, r=pietroalbini
fb94aa5 
[beta] Rollup backports

Cherry-picked:

*  Always use the Rust version in package names rust-lang#77336
*  rustc_parse: More precise spans for `tuple.0.0` rust-lang#77774
*  Update crossbeam-channel to avoid UB rust-lang#77819
*  build-manifest: stop generating numbered channel names except for stable rust-lang#77854
*  Dist build manifest rust-lang#77762
*  bootstrap: set correct path for the build-manifest binary rust-lang#77909

r? `@ghost`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jyn514 jyn514 jyn514 approved these changes

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. I-unsound Issue: A soundness hole (worst kind of bug), see: https://en.wikipedia.org/wiki/Soundness merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.48.0
Development

Successfully merging this pull request may close these issues.