Rollup of 11 pull requests #29039
Merged
Rollup of 11 pull requests #29039
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
Manishearth
commented
Oct 14, 2015
Manishearth
commented
- Successful merges: Rustfmt-ing liblog v2. #28991, Add regression test for #22814 #29004, require a method callee's type to outlive the call #29006, Fix Lifetime Elision link in lifetimes.md #29013, Avoid using getDataLayout, deprecated in LLVM 3.7 #29016, rusftmt libfmt_macros #29024, Properly link up iterator documentation #29027, Unhide some code from the Traits section #29028, Document the free functions of std::iter #29029, Rustfmt-ing librustc_bitflags. #29032, fix link on std::result::Result #29035
- Failed merges:
This rather crucial requirement was not checked. In most cases, that didn't cause any trouble because the argument types are required to outlive the call and are subtypes of a subformula of the callee type. However, binary ops are taken by ref only indirectly, without it being marked in the argument types, which led to the argument types not being constrained anywhere causing spurious errors (as these are basically unconstrainable, I don't think this change can break code). Of course, the old way was also incorrent with contravariance, but that is still unsound for other reasons. This also improves rustc::front to get RUST_LOG to *somewhat* work. Fixes rust-lang#28999
Having this code section hidden is misleading because it makes it look like implementing Circle for Foo automatically makes Foo implement Shape.
Flesh the docs out with examples.
This reverts commit 5b8335e.
The link is broken here: <https://doc.rust-lang.org/std/io/#types>. Looks like crate documentation generator uses only first paragraph of the module documentation and so doesn't resolve the link defined below.
|
@bors r+ rollup |
|
📌 Commit 0c7839a has been approved by |
|
(rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors rollup- derp |
|
@bors p=10 |
|
⌛ Testing commit 0c7839a with merge 5cef48e... |
|
💔 Test failed - auto-mac-64-opt |
…I, r=alexcrichton Hi Rustaceans! This is the second version of running rustfmt on liblog rust-lang#28898. There are only rustfmt suggested changes. Because I think that some patterns here (that I fixed up in the prev PR need to be discussed in detail. //cc @nrc
…lexcrichton Closes rust-lang#22814
…felix This rather crucial requirement was not checked. In most cases, that didn't cause any trouble because the argument types are required to outlive the call and are subtypes of a subformula of the callee type. However, binary ops are taken by ref only indirectly, without it being marked in the argument types, which led to the argument types not being constrained anywhere causing spurious errors (as these are basically unconstrainable, I don't think this change can break code). Of course, the old way was also incorrent with contravariance, but that is still unsound for other reasons. This also improves rustc::front to get RUST_LOG to *somewhat* work. Fixes rust-lang#28999. That issue is one of the several regression introduced by rust-lang#28669. r? @pnkfelix
…ision_link, r=alexcrichton This link was added in rust-lang#28842 but doesn't work at https://doc.rust-lang.org/nightly/book/lifetimes.html. What works in my markdown preview doesn't work live, and vice versa.
Having this code section hidden is misleading because it makes it look like implementing Circle for Foo automatically makes Foo implement Shape.
…alexcrichton Flesh the docs out with examples.
…bitflags, r=alexcrichton Hi Rustaceans! This is the result of running latest rustfmt on librustc_bitflags! //cc @nrc
r? @steveklabnik The link is broken here: <https://doc.rust-lang.org/std/io/#types>. Looks like crate documentation generator uses only first paragraph of the module documentation and so doesn't resolve the link defined below. Probably this behaviour of the documentation generator should be considered as a bug and should be reported.
|
@bors r+ p=10 force |
|
📌 Commit b330df2 has been approved by |
|
⌛ Testing commit b330df2 with merge 9307d45... |
|
@bors r+ p=10 force |
|
📌 Commit 66b58d1 has been approved by |
|
@bors force |
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.