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

Rollup of 4 pull requests #68566

Merged
merged 10 commits into from
Jan 27, 2020
Merged

Rollup of 4 pull requests #68566

merged 10 commits into from
Jan 27, 2020

Conversation

pietroalbini
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

XAMPPRocky and others added 10 commits January 21, 2020 11:47
@XAMPPRocky
Update RELEASES.md for 1.41.0
c75a1f0
@XAMPPRocky
Update RELEASES.md
5918e9f
@wesleywiser
[self-profiler] Use ThreadId::as_u64() instead of transmute
ea42b1c
@wesleywiser
[self-profiler] Clean up EventFilter
2acf5a3
@Aaron1011
Ensure that we error when calling "const extern fn" with wrong conven…
4a65032 
…tion

See rust-lang#64926
@hjung0
update
9a78c2b
@pietroalbini
Rollup merge of rust-lang#67928 - XAMPPRocky:relnotes-1.41.0, r=pietr…
c8d5f4d 
…oalbini

Update RELEASES.md for 1.41.0

### [Rendered](https://github.com/XAMPPRocky/rust/blob/relnotes-1.41.0/RELEASES.md)

cc @rust-lang/release
@pietroalbini
Rollup merge of rust-lang#68370 - Aaron1011:const-extern-test, r=Ralf…
7e82434 
…Jung

Ensure that we error when calling "const extern fn" with wrong convention

See rust-lang#64926
@pietroalbini
Rollup merge of rust-lang#68531 - wesleywiser:cleanup_self_profiler, …
9188bab 
…r=michaelwoerister

[self-profiler] Two small cleanups

r? @michaelwoerister
@pietroalbini
Rollup merge of rust-lang#68562 - hjung4:spell, r=jonas-schievink
5f9284c 
Fix spelling errors
@pietroalbini
Copy link
Member Author

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

@bors
Copy link
Contributor

bors commented Jan 27, 2020

📌 Commit 5f9284c has been approved by pietroalbini

@rustbot rustbot added the rollup A PR which is a rollup label Jan 27, 2020
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 27, 2020
bors added a commit that referenced this pull request Jan 27, 2020
@bors
Auto merge of #68566 - pietroalbini:rollup-22hbo3e, r=pietroalbini
8a79d08 
Rollup of 4 pull requests

Successful merges:

 - #67928 (Update RELEASES.md for 1.41.0)
 - #68370 (Ensure that we error when calling "const extern fn" with wrong convention)
 - #68531 ([self-profiler] Two small cleanups)
 - #68562 (Fix spelling errors)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Jan 27, 2020

⌛ Testing commit 5f9284c with merge 8a79d08...

@bors
Copy link
Contributor

bors commented Jan 27, 2020

☀️ Test successful - checks-azure
Approved by: pietroalbini
Pushing 8a79d08 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 27, 2020
@bors bors merged commit 5f9284c into rust-lang:master Jan 27, 2020
@pietroalbini pietroalbini deleted the rollup-22hbo3e branch December 23, 2020 23:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@pietroalbini @bors @rustbot @XAMPPRocky @wesleywiser @Aaron1011 @hjung0