Rollup of 7 pull requests #42178
Closed
Rollup of 7 pull requests #42178
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
Mark-Simulacrum
commented
May 23, 2017
Mark-Simulacrum
commented
- Successful merges: Change some notes into suggestions #42033, trace_macro: Show both the macro call and its expansion. #42072. #42103, libstd/sync/mpsc: relicense under rust license #42149, Document drop more. #42159, Override size_hint and propagate ExactSizeIterator for iter::StepBy #42167, Give step_trait a distinct tracking issue from step_by #42169, Remove some needless // gate-test- comments #42177
- Failed merges:
These files are licensed under a different license than the rest of the codebase. This causes potential issues and inconveniences. Relicense these files under the standard license. I hold original copyright on that code. Fixes rust-lang#36556
Generally useful, but also a prerequisite for moving a bunch of unit tests off Range::step_by.
iterator_step_by has decoupled their futures, so the tracking issue should split.
Also, add detection to treat such comments as tidy errors. We also remove the found_lib_feature code because it was just repeating the found_feature code. Originally it was intended to allow for gate-test lines for lib features, but apparently nobody missed it.
Change some notes into suggestions r? @petrochenkov since you commented on the same edits in rust-lang#39458
trace_macro: Show both the macro call and its expansion. rust-lang#42072. See rust-lang#42072 for the initial motivation behind this. The change is not the minimal fix, but I want this behavior almost every time I use `trace_macros`.
libstd/sync/mpsc: relicense under rust license These files are licensed under a different license than the rest of the codebase. This causes potential issues and inconveniences. Relicense these files under the standard license. I hold original copyright on that code. Fixes rust-lang#36556
Document drop more. Adds two examples to Drop and describes the recursive drop on types that contain fields.
…excrichton Override size_hint and propagate ExactSizeIterator for iter::StepBy Generally useful, but also a prerequisite for moving a bunch of unit tests off `Range*::step_by`. A small non-breaking subset of rust-lang#42110 (which I closed). Includes two small documentation changes @ivandardi requested on that PR. r? @alexcrichton
…excrichton Give step_trait a distinct tracking issue from step_by iterator_step_by has decoupled their futures, so the tracking issue should split. Old issue: rust-lang#27741 New issue: rust-lang#42168 r? @alexcrichton (another follow-up to closed PR rust-lang#42110 (comment))
Remove some needless // gate-test- comments Also, add detection to treat such comments as tidy errors. We also remove the found_lib_feature code because it was just repeating the found_feature code. Originally it was intended to allow for gate-test lines for lib features, but apparently nobody missed it.
|
r? @aturon (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors r+ p=10 |
|
📌 Commit d8afdf1 has been approved by |
|
⌛ Testing commit d8afdf1 with merge 447ec1e... |
arielb1
added
the
S-waiting-on-bors
|
💔 Test failed - status-travis |
|
Failure looks to be from #42033. |
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.