Skip to content

Rollup of 9 pull requests - #36627

Closed
sophiajt wants to merge 20 commits into
rust-lang:masterfrom
sophiajt:rollup
Closed

Rollup of 9 pull requests#36627
sophiajt wants to merge 20 commits into
rust-lang:masterfrom
sophiajt:rollup

Conversation

mikhail-m1and others added 20 commits September 16, 2016 21:44
Currently `TypedArena` allocates its first chunk, which is usually 4096
bytes, as soon as it is created. If no allocations are ever made from
the arena then this allocation (and the corresponding deallocation) is
wasted effort.
This commit changes `TypedArena` so it doesn't allocate the first chunk
until the first allocation is made.
This change speeds up rustc by a non-trivial amount because rustc uses
`TypedArena` heavily: compilation speed (producing debug builds) on
several of the rustc-benchmarks increases by 1.02--1.06x. The change
should never cause a slow-down because the hot `alloc` function is
unchanged. It does increase the size of `TypedArena` by one `usize`
field, however.
The commit also fixes some out-of-date comments.
…rner
Updated E0560 to new error format
Added a small bit of code to add a label for E0560.
Also renamed src/test/compile-fail/E560.rs file to E0560.rs (not sure why it was named E560).
Updated all test cases which check this error.
Closesrust-lang#36199
…eddyb
Workaround rust-lang#34427 by using memset of 0 on ARM to set the discriminant.
Workaround rust-lang#34427 by using memset of 0 on ARM to set the discriminant.
…, r=nrc
Add the ability to merge spans to codemap
This PR adds the ability to merge Spans. To do so, it builds on the Codemap's ability to verify the locations of spans, namely that following can be verified:
* the expn_id of both spans much match
* the lhs span needs to end on the same line the rhs span begins
* the lhs span must start at or before the rhs span
If all of these are met, a new span is returned that is min(lo), max(hi) of the two spans.
This PR also removes an older Span merge, as this new functionality subsumes it.
r? @nrc
…_fix, r=bluss
fixed the safety header/wording in option.rs
Fixesrust-lang#36581
screenshot of the rendered documentation: http://imgur.com/14kLVrA
r? @steveklabnik
Lazily allocate TypedArena's first chunk
Currently `TypedArena` allocates its first chunk, which is usually 4096
bytes, as soon as it is created. If no allocations are ever made from
the arena then this allocation (and the corresponding deallocation) is
wasted effort.
This commit changes `TypedArena` so it doesn't allocate the first chunk
until the first allocation is made.
This change speeds up rustc by a non-trivial amount because rustc uses
`TypedArena` heavily: compilation speed (producing debug builds) on
several of the rustc-benchmarks increases by 1.02--1.06x. The change
should never cause a slow-down because the hot `alloc` function is
unchanged. It does increase the size of `TypedArena` by one `usize`
field, however.
The commit also fixes some out-of-date comments.
…pasel422
Minor correction in `sort_by_key` doc comment
The parameter to `sort_by_key` is named `f`, not `key`.
…abnik
Fix some typos and improve doc comments style
r? @steveklabnik
@sophiajt

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=1

@bors

bors commented Sep 21, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 708bfe0 has been approved by jonathandturner

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @pnkfelix

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

@bors

bors commented Sep 21, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 708bfe0 with merge 0a9e6e1...

@bors

bors commented Sep 21, 2016

Copy link
Copy Markdown
Collaborator

💔 Test failed - auto-win-gnu-32-opt-rustbuild

@CentrilCentril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollup

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants

@sophiajt@bors@rust-highfive@pnkfelix@Centril@mikhail-m1@aclarry@GuillaumeGomez@nnethercote@caipre