Skip to content

Rollup of 17 pull requests - #37604

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

Rollup of 17 pull requests#37604
sophiajt wants to merge 35 commits into
rust-lang:masterfrom
sophiajt:rollup

Conversation

mbrubeckand others added 30 commits October 18, 2016 10:56
The example code for higher-ranked trait bounds on closures had an
unnecessary `mut` which was confusing, and the text referred to an
mutable reference which does not exist in the code (and isn't needed).
Removed the `mut`s and fixed the text to better describe the actual
error for the failing example.
The rustc-generated function `main` should respect the same config for
frame pointer elimination as the rest of code.
Environment variables on windows can't be empty.
* Correct the stability attributes.
* Make Add and AddAssign actually behave the same.
* Use String::with_capacity when allocating a new string.
* Fix the tests.
On 64-bit platforms this reduces the size of `Expr` from 96 bytes to 88
bytes.
On 64-bit platforms this reduces the size of `Expr_` from 64 bytes to
56 bytes, and reduces the size of `Expr` from 88 bytes to 80 bytes.
It seems to prevent it from being inlined.
The mx_cprng_draw syscall has changed signature to separate the status
and size return values, rather than multiplexing them into a single
value with errors interpreted as a negative value. This patch tracks
that change.
Fix some mistakes in HRTB docs
The example code for higher-ranked trait bounds on closures had an unnecessary `mut` which was confusing, and the text referred to an mutable reference which does not exist in the code (and isn't needed). Removed the `mut`s and fixed the text to better describe the actual error for the failing example.
Thanks to csd_ on IRC for pointing out these problems!
r? @steveklabnik
…eveklabnik
Add missing urls for ErrorKind's variants
r? @steveklabnik
Feature gate Self and associated types in struct expressions and patterns
cc rust-lang#37544Fixesrust-lang#37035 (comment)
r? @nikomatsakis
set frame pointer elimination attribute for main
The rustc-generated function `main` should respect the same config for
frame pointer elimination as the rest of code.
Use DefId's in const eval for cross-crate const fn's
Fixesrust-lang#36954.
r? @eddyb
cc @raphaelcohn
Fix ICE when querying DefId on Def::Err.
Also moves computations into check that `kind_id` is `Ok(_)`, which is in theory an optimization, though I expect it's minor.
Fixesrust-lang#37534.
r? @eddyb.
…hton
Peekable::peek(): Use Option::as_ref()
Replace the match expression in .peek() with Option::as_ref() since it's the same functionality.
Set RUSTC_BOOTSTRAP to some value.
Environment variables on windows can't be empty.
Fix issues with the Add/AddAssign impls for Cow<str>
* Correct the stability attributes.
* Make Add and AddAssign actually behave the same.
* Use String::with_capacity when allocating a new string.
* Fix the tests.
reference full path DefaultHasher
Since `DefaultHasher` does not in scope, it's not obvious where to find it.
…richton
Add `-Z hir-stats` for collecting statistics on HIR and AST
The data collected will be printed to the commandline and looks like the following:
```
// stats for libcore
PRE EXPANSION AST STATS
Name Accumulated Size Count Item Size
----------------------------------------------------------------
TypeBinding 2_280 57 40
Mod 3_560 89 40
PathListItem 6_516 181 36
Variant 7_872 82 96
LifetimeDef 21_280 380 56
StructField 22_880 260 88
Lifetime 23_800 1_190 20
Local 30_192 629 48
ForeignItem 31_504 179 176
Arm 42_880 670 64
Mac 46_960 587 80
FnDecl 57_792 1_204 48
TraitItem 69_504 362 192
TyParamBound 98_280 945 104
Block 108_384 2_258 48
Stmt 144_720 3_618 40
ImplItem 230_272 1_028 224
Item 467_456 1_826 256
Pat 517_776 4_623 112
Attribute 745_680 15_535 48
Ty 1_114_848 9_954 112
PathSegment 1_218_528 16_924 72
Expr 3_082_408 20_279 152
----------------------------------------------------------------
Total 8_095_372
POST EXPANSION AST STATS
Name Accumulated Size Count Item Size
----------------------------------------------------------------
MacroDef 1_056 12 88
Mod 3_400 85 40
TypeBinding 4_280 107 40
PathListItem 6_516 181 36
Variant 7_872 82 96
StructField 24_904 283 88
ForeignItem 31_504 179 176
TraitItem 69_504 362 192
Local 85_008 1_771 48
Arm 100_288 1_567 64
Lifetime 123_980 6_199 20
LifetimeDef 126_728 2_263 56
TyParamBound 297_128 2_857 104
FnDecl 305_856 6_372 48
Block 481_104 10_023 48
Stmt 535_120 13_378 40
Item 1_469_952 5_742 256
Attribute 1_629_840 33_955 48
ImplItem 1_732_864 7_736 224
Pat 2_360_176 21_073 112
PathSegment 5_888_448 81_784 72
Ty 6_237_168 55_689 112
Expr 12_013_320 79_035 152
----------------------------------------------------------------
Total 33_536_016
HIR STATS
Name Accumulated Size Count Item Size
----------------------------------------------------------------
MacroDef 864 12 72
Mod 2_720 85 32
TypeBinding 3_424 107 32
PathListItem 5_068 181 28
Variant 6_560 82 80
StructField 20_376 283 72
ForeignItem 27_208 179 152
WherePredicate 43_776 684 64
TraitItem 52_128 362 144
Decl 68_992 2_156 32
Local 89_184 1_858 48
Arm 94_368 1_966 48
LifetimeDef 108_624 2_263 48
Lifetime 123_980 6_199 20
Stmt 168_000 4_200 40
TyParamBound 251_416 2_857 88
FnDecl 254_880 6_372 40
Block 583_968 12_166 48
Item 1_240_272 5_742 216
ImplItem 1_361_536 7_736 176
Attribute 1_620_480 33_760 48
Pat 2_073_120 21_595 96
Path 2_385_856 74_558 32
Ty 4_455_040 55_688 80
PathSegment 5_587_904 87_311 64
Expr 7_588_992 79_052 96
----------------------------------------------------------------
Total 28_218_736
```
Jonathan Turner added 5 commits November 5, 2016 08:47
…alexcrichton
Change `Into<Vec<u8>> for String` and `Into<OsString> for PathBuf` to From
Fixesrust-lang#37561. First contribution, happy with any and all feedback!
Remove recursive call from Cow::to_mut
It seems to prevent it from being inlined.
…chton
std: Track change to cprng syscall signature (Fuchsia)
The mx_cprng_draw syscall has changed signature to separate the status
and size return values, rather than multiplexing them into a single
value with errors interpreted as a negative value. This patch tracks
that change.
Add error when proc_macro_derive is used not on functions
Fixesrust-lang#37590
@sophiajt

Copy link
Copy Markdown
ContributorAuthor

@bor r+ p=1

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @pnkfelix

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

@sophiajt

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=1

@bors

bors commented Nov 5, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 14e8f9f has been approved by jonathandturner

@sophiajt

Copy link
Copy Markdown
ContributorAuthor

cc @alexcrichton who tried a rollup earlier

@GuillaumeGomez

Copy link
Copy Markdown
Member

A bit of everyone tried actually. :p

@bors

bors commented Nov 5, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 14e8f9f with merge bcb98e3...

@bors

bors commented Nov 5, 2016

Copy link
Copy Markdown
Collaborator

💔 Test failed - auto-linux-cross-opt

@alexcrichton

Copy link
Copy Markdown
Member

gonna try again with #37597

@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.

20 participants

@sophiajt@rust-highfive@bors@GuillaumeGomez@alexcrichton@pnkfelix@Centril@mbrubeck@petrochenkov@dinfuehr@TimNN@mglagla@Mark-Simulacrum@brson@ollie27@nnethercote@liigo@michaelwoerister@leoyvens@raphlinus