Rollup of 8 pull requests #25827
Merged
Rollup of 8 pull requests #25827
Conversation
This file contains hidden or 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
Member
Manishearth
commented
May 27, 2015
Manishearth
commented
- Successful merges: Add note about filesystems to fs::rename #25128, Document #[repr] on non-C-like enums #25651, Document std::env::const values #25668, docs: Improve descriptions for some methods in core::cell. #25726, Use an iterator for reader::tagged_docs. #25760, Remove redundant compiler check. Allow CC override #25792, Add a WONTFIX message to a failing test. #25806, Manpages #25807
- Failed merges:
Currently, there are two conditional blocks that exist to check for "clang or gcc"
On line 866:
```
if [ -z "$CFG_ENABLE_CLANG" -a -z "$CFG_GCC" ]
then
err "either clang or gcc is required"
fi
```
and on line 1019:
```
if [ -z "$CC" -a -z "$CFG_ENABLE_CLANG" -a -z "$CFG_GCC" ]
then
err "either clang or gcc is required"
fi
```
Given the order of the clauses, this results in the "either clang or gcc is required" error from the earlier block, (even) when CC is set.
The expected behaviour is to honour user-flags, in this case CC.
Aside from removing all hand-holdy compiler checks in favour of actual compiler *feature* checks, this change removes the redundant former block in favour of the latter block, which appears designed to allow the expected behaviour.
Estimating August as the release date for 1.2.0.
rustc -C target-cpu=help is no longer supported. Recommend the llc tool intead like 'rustc --help'.
|
r? @Aatch (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors: r+ p-10 |
|
📌 Commit 644046f has been approved by |
Currently part of the description of the `into_inner` method of `UnsafeCell` seems backwards.
|
@bors: r+ p=20 |
|
📌 Commit b6fbabb has been approved by |
|
⌛ Testing commit b6fbabb with merge 02453f0... |
|
💔 Test failed - auto-linux-64-x-android-t |
Currently, there are two conditional blocks that exist to check for "clang or gcc"
On line 866:
```
if [ -z "$CFG_ENABLE_CLANG" -a -z "$CFG_GCC" ]
then
err "either clang or gcc is required"
fi
```
and on line 1019:
```
if [ -z "$CC" -a -z "$CFG_ENABLE_CLANG" -a -z "$CFG_GCC" ]
then
err "either clang or gcc is required"
fi
```
Given the order of the clauses, this results in the "either clang or gcc is required" error from the earlier block, (even) when CC is set.
The expected behaviour is to honour user-flags, in this case CC.
Aside from removing all hand-holdy compiler checks in favour of actual compiler *feature* checks, this change removes the redundant former block in favour of the latter block, which appears designed to allow the expected behaviour.
Quick update to fix two manpage issues I noticed in rust-lang#25689.
|
@bors: r+ force |
|
📌 Commit 6090d15 has been approved by |
bors
added a commit
that referenced
this pull request
May 27, 2015
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
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.