Rollup of 6 pull requests #39712
Merged
Rollup of 6 pull requests #39712
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
Member
frewsxcv
commented
Feb 10, 2017
frewsxcv
commented
- Successful merges: rustbuild: support setting verbosity in config.toml #39587, parser: fix ICE when parsing token trees after an error #39674, driver: restore partially deleted comment #39693, Adding compile fail test for const_indexing feature #39700, name anonymous fn parameters in libcore traits #39705, change span_notes to notes in E0368/E0369 #39707
- Failed merges:
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
* 'master' of git://github.com/rust-lang/rust: (70 commits) sanitizer-dylib: only run where std for x86_64-linux is available travis: Fix build order of dist-x86-linux fix the sanitizer-dylib test on non x86_64 linux hosts dist-x86-linux: install newer kernel headers enable sanitizers on build job that tests x86_64 linux enable sanitizers on x86_64-linux releases use helper function in the rebuild logic of the rustc_*san crates build/test the sanitizers only when --enable-sanitizers is used sanitizer support Add missing urls on join_paths Add test for rust-lang#27433 Add more examples, get everything passing at last. Remove some leftover makefiles. Add more test for rustdoc --test Rename manifest_version to manifest-version reference: clarify #[cfg] section Bump stable release date rustbuild: Clean build/dist on `make clean` Add missing urls for current_dir review nits ...
rustbuild: support setting verbosity in config.toml Most if not all the configuration is settable trhough config.toml but the verbosity isn't yet. This avoids having to pass -v to x.py on each command if you want verbosity to be always on.
…E, r=nrc parser: fix ICE when parsing token trees after an error Fixes rust-lang#39388, fixes rust-lang#39616. r? @nrc
driver: restore partially deleted comment Fixes rust-lang#39689. Comment was lost in commit 811b874 (rust-lang#31916 @nagisa).
Adding compile fail test for const_indexing feature First attempt at contributing to rust. Picked up an easy feature to test. Issue rust-lang#39059 r? @est31
…uron name anonymous fn parameters in libcore traits This follows the discussion in rust-lang/rfcs#1685. The patch gives names to anonymous parameters in libcore traits. It would have two benefits I can think of: firstly it would provide names to tools that can use the names from the traits, and secondly core/std can serve as an example when writing traits; this change helps by not encouraging the use of anonymous parameters.
…athandturner change span_notes to notes in E0368/E0369 Fixes rust-lang#39650. All the uses of `span_note` in these errors were reusing the same span as the original error, which causes unnecessary repetition. For an example, see the changes to [src/test/ui/span/issue-39018.stderr](https://github.com/rust-lang/rust/pull/39707/files?diff=unified#diff-46336f62958fdb34233db414cb9914a1R4). r? @jonathandturner
|
@bors r+ p=10 |
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (or someone else) soon. If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes. Please see the contribution instructions for more information. |
|
📌 Commit 84ad515 has been approved by |
|
⌛ Testing commit 84ad515 with merge 5391252... |
|
💔 Test failed - status-travis |
|
@bors retry |
|
⌛ Testing commit 84ad515 with merge f805144... |
|
☀️ Test successful - status-appveyor, status-travis |
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.