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.

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

Rollup of 11 pull requests #32454

Merged
merged 24 commits into from
Mar 23, 2016
Merged

Rollup of 11 pull requests #32454

merged 24 commits into from
Mar 23, 2016

Conversation

WiSaGaN and others added 24 commits March 22, 2016 00:45
Apparently these aren't supposed to be stored in network byte order, so doing so
ends up causing failures when it would otherwise succeed when stored in the host
byte order.

Closes rust-lang#32424
Const was dereferenced when autoderefs is zero.
I apt to use `expressions` over `statements`, because `match` is a expression in essence, though it can become a statement when followed a semicolon.
…default, r=aturon

Implement Default trait for OsString/OsStr

Fixes rust-lang#32385
…ichton

rustdoc: Omit `pub` for inlined variant-struct fields

fixes rust-lang#32395

r? @alexcrichton
Added version 7.3* for Apple's clang compiler

The recent 7.3 clang version was missing.

Closes rust-lang#32442
std: Store flowinfo/scope_id in host byte order

Apparently these aren't supposed to be stored in network byte order, so doing so
ends up causing failures when it would otherwise succeed when stored in the host
byte order.

Closes rust-lang#32424
Fix const trans

Fix rust-lang#30615.

The idea was that when there are N autoderefs, first do N-1 derefs and check for autoref. If there is autoref, done, if not, do one more deref. But when N is zero, doing one more deref is wrong.
… r=steveklabnik

Simplifying some of the phrasing explaining lifetime elision

Just simplifying some of the language expressing what kind of inference Rust can and can't do on function signatures.
rustdoc: Consider `doc(no_inline)` in crate-local inlining

Imports with `doc(no_inline)` will not be inlined, even when `doc(inline)` is present.

fixes rust-lang#32343

r? @alexcrichton
Annotate run-pass/backtrace with #[rustc_no_mir] on MSVC.

Fixes rust-lang#32384 by not using MIR on MSVC for the functions in the path of the backtrace.
This is the known blocker for the MSVC MIR builder, hopefully the only one overall.
r? @alexcrichton Confirmed to work on a nightly, by @retep998.
Docs: Change "statements" to "expressions" on `match`

I apt to use `expressions` over `statements`, because `match` is a expression in essence, though it can become a statement when followed a semicolon.
@rust-highfive
Copy link
Collaborator

r? @aturon

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

@eddyb
Copy link
Member Author

eddyb commented Mar 23, 2016

@bors r=eddyb p=1

@bors
Copy link
Contributor

bors commented Mar 23, 2016

📌 Commit 2e9b40f has been approved by eddyb

@bors
Copy link
Contributor

bors commented Mar 23, 2016

⌛ Testing commit 2e9b40f with merge 98f0a91...

bors added a commit that referenced this pull request Mar 23, 2016
Rollup of 11 pull requests

- Successful merges: #32404, #32420, #32423, #32425, #32429, #32430, #32431, #32434, #32437, #32441, #32443
- Failed merges:
@bors bors merged commit 2e9b40f into rust-lang:master Mar 23, 2016
@eddyb eddyb deleted the rollup branch March 23, 2016 22:54
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.