Skip to content

Rollup of 10 pull requests - #77013

Merged
bors merged 21 commits into
rust-lang:masterfrom
RalfJung:rollup-84ut0xq
Sep 21, 2020
Merged

Rollup of 10 pull requests#77013
bors merged 21 commits into
rust-lang:masterfrom
RalfJung:rollup-84ut0xq

Conversation

@RalfJung

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

GuillaumeGomezand others added 21 commits September 8, 2020 21:07
glibc destroys[1] the passed pthread_attr_t if pthread_getattr_np()
fails. Destroying it again leads to a segfault. Fix it by only
destroying it on success for glibc.
[1]: https://sourceware.org/git/?p=glibc.git;a=blob;f=nptl/pthread_getattr_np.c;h=ce437205e41dc05653e435f6188768cccdd91c99;hb=HEAD#l205
…ibcs
The calling convention of pthread_getattr_np() is to initialize the
pthread_attr_t, so _destroy() is only necessary on success (and _init()
isn't necessary beforehand). On the other hand, FreeBSD wants the
attr_t to be initialized before pthread_attr_get_np(), and therefore it
should always be destroyed afterwards.
This made too many assumptions about platforms, breaking some things.
Will need to be added later with a better way of gating on proper
alignment, without hardcoding cfg(target_arch)s.
test is already in scope, no need to use the full path
Also add an Oxford comma while we're editing that line.
…n-e0755, r=pickfire,jyn514
Add error explanation for E0755
r? @pickfire
…roy, r=Amanieu
Fix segfault if pthread_getattr_np fails
glibc [destroys][1] the passed pthread_attr_t if pthread_getattr_np()
fails. Destroying it again leads to a segfault. Fix it by only
destroying it on success for glibc.
[1]: https://sourceware.org/git/?p=glibc.git;a=blob;f=nptl/pthread_getattr_np.c;h=ce437205e41dc05653e435f6188768cccdd91c99;hb=HEAD#l205
make replace_prefix only take &str as arguments
included the clippy::manual strip commit to not run into merge conflicts later.
r? @lcnr
…mic-from-mut, r=kodrAus
Revert adding Atomic::from_mut.
This reverts rust-lang#74532, which made too many assumptions about platforms, breaking some things.
Will need to be added later with a better way of gating on proper alignment, without hardcoding cfg(target_arch)s.
---
To be merged if fixing from_mut (rust-lang#76965) takes too long.
r? @ghost
Add a regression test for copy propagation miscompilation
liballoc bench use imported path Bencher
test is already in scope, no need to use the full path
Fix typo in rustc_lexer docs
Also add an Oxford comma while we're editing that line.
@RalfJung

Copy link
Copy Markdown
MemberAuthor

@rustbot modify labels: +rollup
@bors r+ rollup=never p=10

@bors

bors commented Sep 21, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 6417eb0 has been approved by RalfJung

@rustbotrustbot added the rollup A PR which is a rollup label Sep 21, 2020
@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 21, 2020
@bors

bors commented Sep 21, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 6417eb0 with merge 4eff9b0...

@bors

bors commented Sep 21, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions, checks-azure
Approved by: RalfJung
Pushing 4eff9b0 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Sep 21, 2020
@bors
bors merged commit 4eff9b0 into rust-lang:masterSep 21, 2020
@rustbotrustbot added this to the 1.48.0 milestone Sep 21, 2020
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

12 participants

@RalfJung@bors@rustbot@GuillaumeGomez@tavianator@matthiaskrgr@tmiasko@m-ou-se@pickfire@ssomers@LingMan@est31