Skip to content

Rollup of 9 pull requests - #79128

Merged
bors merged 22 commits into
rust-lang:masterfrom
m-ou-se:rollup-lzz1dym
Nov 17, 2020
Merged

Rollup of 9 pull requests#79128
bors merged 22 commits into
rust-lang:masterfrom
m-ou-se:rollup-lzz1dym

Conversation

@m-ou-se

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

tmiaskoand others added 22 commits November 12, 2020 00:00
The memory allocation in vec might panic in the case of capacity
overflow. Move the allocation outside the function to fix the test.
…backline, r=jyn514
Ensure that the source code display is working with DOS backline
Fixesrust-lang#76361.
cc ````@lzutao````
r? ````@jyn514````
…Simulacrum
Upgrade dlmalloc to version 0.2
In preparation of adding dynamic memory management support for SGXv2-enabled platforms, the dlmalloc crate has been refactored. More specifically, support has been added to implement platform specification outside of the dlmalloc crate. (see alexcrichton/dlmalloc-rs#15)
This PR upgrades dlmalloc to version 0.2 for the `wasm` and `sgx` targets.
As the dlmalloc changes have received a positive review, but have not been merged yet, this PR contains a commit to prevent tidy from aborting CI prematurely.
cc: `@jethrogb`
Make codegen tests compatible with extra inlining
…r=oli-obk
Limit storage duration of inlined always live locals
Closesrust-lang#76375.
document that __rust_alloc is also magic to our LLVM fork
Based on [comments](rust-lang#79045 (comment)) by ````@tmiasko```` and ````@bjorn3.````
clarify `span_label` documentation
Fixesrust-lang#71857.
r? ``@estebank``
cc ``@RalfJung``
…tml-tag-lint, r=jyn514
Code block invalid html tag lint
Fixesrust-lang#79095
r? ``@jyn514``
std: Fix test `symlink_hard_link` on Windows
The test was introduced in rust-lang#78026 and fails depending on Windows version and admin rights.
Other similar tests check for symlink creation permissions before doing anything, this PR performs the same check for `symlink_hard_link` as well.
…, r=Mark-Simulacrum
build-manifest: strip newline from rustc version
Backport of rust-lang#79096 on the master branch. This will also need to be included in the beta bump tomorrow.
r? `@Mark-Simulacrum`
`@rustbot` modify labels: beta-nominated beta-accepted T-infra
@rustbotrustbot added the rollup A PR which is a rollup label Nov 17, 2020
@m-ou-se

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=9 rollup=never

@bors

bors commented Nov 17, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit d6c5c52 has been approved by m-ou-se

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 17, 2020
@bors

bors commented Nov 17, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit d6c5c52 with merge efcb3b3...

@bors

bors commented Nov 17, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: m-ou-se
Pushing efcb3b3 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Nov 17, 2020
@bors
bors merged commit efcb3b3 into rust-lang:masterNov 17, 2020
@rustbotrustbot added this to the 1.50.0 milestone Nov 17, 2020
@borsbors mentioned this pull request Nov 17, 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.

10 participants

@m-ou-se@bors@rustbot@tmiasko@raoulstrackx@GuillaumeGomez@RalfJung@petrochenkov@emilyalbini@euclio