Rollup of 12 pull requests #36818
Merged
Rollup of 12 pull requests #36818
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
sophiajt
commented
Sep 29, 2016
sophiajt
commented
- Successful merges: Add docs for "!" Never type (rfc 1216) #35286, run rustfmt on typecheck/coherence folder #35892, map crate numbers between compilations #36460, Move ty_align and ty_size out of most C ABI code #36704, Remove CString drop test. #36741, Allow supplying an error destination via the compiler driver #36760, Avoid re-export errors in the generated test harness #36787, Allow more non-inline modules in blocks #36789, add a panic-strategy field to the target specification #36794, Move nodejs detection into bootstrap #36803, Update bootstrap compiler #36811, Add link to format! docs #36813
- Failed merges:
s390x's C ABI ty_align and ty_size are not moved because the implementation of ty_align varies in an atypical pattern: it calls ty_size for the llvm::Vector type kind. ty_size then cannot be moved since it indirectly calls ty_align through align.
The test relies on the undefined behavior, and so may fail in some circumstances. This can be worked around by stubbing a memory allocator in the test, but it is a bit of work, and LLVM could still theoretically eliminate the write of the zero byte in release mode (which is intended). So let's just remove the test and mark the function as inline. It shouldn't be optimized away when inlined into the debug build of user's code.
Now a target can define its panic strategy in its specification. If a user doesn't specify a panic strategy via the command line, i.e. '-C panic', then the compiler will use the panic strategy defined by the target specification. Custom targets can pick their panic strategy via the "panic-strategy" field of their target specification JSON file. If omitted in the specification, the strategy defaults to "unwind". closes rust-lang#36647
Allows replacing stderr with a buffer from the client. Also, some refactoring around run_compiler.
This avoids issues with mingw path conversions.
…komatsakis Add docs for "!" Never type (rfc 1216) Pull Request: rust-lang/rfcs#1216 Tracking Issue: rust-lang#35121
…ikomatsakis run rustfmt on typecheck/coherence folder
map crate numbers between compilations ?r nikomatsakis issue rust-lang#35123
Move ty_align and ty_size out of most C ABI code s390x's C ABI ty_align and ty_size are not moved because the implementation of ty_align varies in an atypical pattern: it calls ty_size for the llvm::Vector type kind. ty_size then cannot be moved since it indirectly calls ty_align through align. Fixes rust-lang#5116 (probably, not sure).
Remove CString drop test. The test relies on the undefined behavior, and so may fail in some circumstances. This can be worked around by stubbing a memory allocator in the test, but it is a bit of work, and LLVM could still theoretically eliminate the write of the zero byte in release mode (which is intended). So let's just remove the test and mark the function as inline. It shouldn't be optimized away when inlined into the debug build of user's code. Supersedes rust-lang#36607 r? @alexcrichton
Allow supplying an error destination via the compiler driver Allows replacing stderr with a buffer from the client. Also, some refactoring around run_compiler.
…_errors, r=nrc Avoid re-export errors in the generated test harness Fixes rust-lang#36768. r? @nrc
…r=nikomatsakis
Allow more non-inline modules in blocks
Currently, non-inline modules without a `#[path]` attribute are not allowed in blocks.
This PR allows non-inline modules that have an ancestor module with a `#[path]` attribute, provided there is not a nearer ancestor block.
For example,
```rust
fn main() {
#[path = "..."] mod foo {
mod bar; //< allowed by this PR
fn f() {
mod bar; //< still an error
}
}
}
```
Fixes rust-lang#36772.
r? @nikomatsakis
add a panic-strategy field to the target specification Now a target can define its panic strategy in its specification. If a user doesn't specify a panic strategy via the command line, i.e. '-C panic', then the compiler will use the panic strategy defined by the target specification. Custom targets can pick their panic strategy via the "panic-strategy" field of their target specification JSON file. If omitted in the specification, the strategy defaults to "unwind". closes rust-lang#36647 --- I checked that compiling an executable for a custom target with "panic-strategy" set to "abort" doesn't need the "eh_personality" lang item and also that standard crates compiled for that custom target didn't contained undefined symbols to _Unwind_Resume. But this needs an actual unit test, any suggestion on how to test this? Most of the noise in the diff is due to moving `PanicStrategy` from the `rustc` to the `rustc_back` crate. r? @alexcrichton cc @phil-opp
Move nodejs detection into bootstrap This avoids issues with mingw path conversions. r? @alexcrichton
Update bootstrap compiler
Add link to format! docs
|
r? @arielb1 (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors r+ p=1 |
|
📌 Commit f12f950 has been approved by |
This was referenced Sep 29, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.