Skip to content

Conversation

m-ou-se
Copy link
Member

@m-ou-se m-ou-se commented Nov 17, 2020

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

tmiasko and 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

Fixes rust-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

Closes rust-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

Fixes rust-lang#71857.

r? ``@estebank``

cc ``@RalfJung``
…tml-tag-lint, r=jyn514

Code block invalid html tag lint

Fixes rust-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
@rustbot rustbot added the rollup A PR which is a rollup label Nov 17, 2020
@m-ou-se
Copy link
Member Author

m-ou-se commented Nov 17, 2020

@bors r+ p=9 rollup=never

@bors
Copy link
Collaborator

bors commented Nov 17, 2020

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

@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 Nov 17, 2020
@bors
Copy link
Collaborator

bors commented Nov 17, 2020

⌛ Testing commit d6c5c52 with merge efcb3b3...

@bors
Copy link
Collaborator

bors commented Nov 17, 2020

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 17, 2020
@bors bors merged commit efcb3b3 into rust-lang:master Nov 17, 2020
@rustbot rustbot added this to the 1.50.0 milestone Nov 17, 2020
@bors bors mentioned this pull request Nov 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

10 participants