Uh oh!
There was an error while loading. Please reload this page.
Rollup of 6 pull requests - #40735
Closed
GuillaumeGomez wants to merge 13 commits into
Closed
Conversation
GuillaumeGomez
commented
Mar 22, 2017
Member
- Successful merges: Add docs for sort_unstable to unstable book #40619, Add whitespace around "=" in assoc items #40689, Fix invalid linking in iter docs #40690, str: Make docs consistently punctuated #40692, E0090: Add explanation for error message #40723, Remove duplicated styling in main.css #40725
- Failed merges:
…e, r=frewsxcv Add docs for sort_unstable to unstable book Tracking issue for the feature: rust-lang#40585 r? @steveklabnik
…ype-formatting, r=frewsxcv Add whitespace around "=" in assoc items Part of rust-lang#40641. r? @rust-lang/docs Before: <img width="1440" alt="screen shot 2017-03-20 at 22 42 34" src="https://cloud.githubusercontent.com/assets/3050060/24123102/89181d8c-0dbe-11e7-897c-841497cf7001.png"> After: <img width="1440" alt="screen shot 2017-03-20 at 22 42 36" src="https://cloud.githubusercontent.com/assets/3050060/24123118/8dec176e-0dbe-11e7-9759-cabbd062a4c2.png">
…wsxcv Fix invalid linking in iter docs r? @rust-lang/docs
…uation, r=bstrie str: Make docs consistently punctuated Every so slightly pointless one character PR, but this was driving me nuts while reading the docs a moment ago (all the [other public structs](https://doc.rust-lang.org/std/str/index.html#structs) have descriptions that end in a full-stop).
…r=estebank E0090: Add explanation for error message See rust-lang#32777 $ rustc --explain E0090 The wrong number of lifetimes were supplied. For example: ``` fn foo<'a: 'b, 'b: 'a>() {} fn main() { foo::<'static>(); // error, expected 2 lifetime parameters } ```
Remove duplicated styling in main.css If nothing else, it saves a bit of data.
GuillaumeGomez
commented
Mar 22, 2017
MemberAuthor
@bors: r+ p=1 |
rust-highfive
commented
Mar 22, 2017
Contributor
Some changes occurred in HTML/CSS. |
bors
commented
Mar 22, 2017
Collaborator
📌 Commit 871cc46 has been approved by |
rust-highfive
commented
Mar 22, 2017
Contributor
r? @frewsxcv (rust_highfive has picked a reviewer for you, use r? to override) |
bors
commented
Mar 23, 2017
Collaborator
⌛ Testing commit 871cc46 with merge 78c92b0... |
frewsxcv
commented
Mar 23, 2017
Contributor
@bors r- everything here was already merged in a previous rollup |
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
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
7 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.