Rollup of 18 pull requests #31148
Merged
Rollup of 18 pull requests #31148
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
steveklabnik
commented
Jan 23, 2016
steveklabnik
commented
- Successful merges: Fix type parameter default error to mention type and trait definitions #30997, Improve CStr::from_ptr example in docs #31019, Add test for #30123 #31031, Add examples of the Entry API to the HashMap documentation. #31035, Improve E0317 long diagnostics #31045, Correct code in E0382 explanation #31050, tweak colors for a11y #31054, Add alt tags for logos #31055, Add Alexis thesis to bibliography #31061, doc: improve grammar #31088, doc: this sentence did not read well #31090, Fix typo in "Getting Started" section of the book #31111, update link to unwind in book #31113, book: Clarify that trait or type must be in same crate as impl #31128, E0210: Add a warning about type aliases #31130, Document that BTreeMap iteration is in order #31136, Fix the missing line in the guessing-game.md #31145, Semaphore not sempahore #31146
- Failed merges: Improve the error explanations for check_const #30932
Documentation of `CStr::from_ptr` suggests using `str::from_utf8(slice.to_bytes()).unwrap()` to obtain a `&str` but `CStr` has `CStr::to_str` that does exactly that.
Introduced in PR rust-lang#30724, needs to mention that type parameter defaults are legal in trait and type definitions too.
Responding to [a thread of discussion on the Rust subreddit](https://www.reddit.com/r/rust/comments/3racik/mutable_lifetimes_are_too_long_when_matching_an/), it was identified that the presence of the Entry API is not duly publicised. This commit aims to add some reasonable examples of common usages of this API to the main example secion of the `HashMap` documentation. This is part of issue rust-lang#29348.
E0210 explains about orphan rules and suggests using a local type as a workaround. It wasn't obvious to me that I couldn't use a type alias, so I added a note.
Also change the examples to make this more obvious. Fixes rust-lang#31129.
Fix type parameter default error to mention type and trait definitions Introduced in PR rust-lang#30724, needs to mention that type parameter defaults are legal in trait and type definitions too.
Documentation of `CStr::from_ptr` suggests using `str::from_utf8(slice.to_bytes()).unwrap()` to obtain a `&str` but `CStr` has `CStr::to_str` that does exactly that. (First PR, be nice :)
This was fixed in passing. Adding a regression test.
…ntry-api, r=steveklabnik Responding to [a thread of discussion on the Rust subreddit](https://www.reddit.com/r/rust/comments/3racik/mutable_lifetimes_are_too_long_when_matching_an/), it was identified that the presence of the Entry API is not duly publicised. This commit aims to add some reasonable examples of common usages of this API to the main example secion of the `HashMap` documentation. This is part of issue rust-lang#29348.
…veklabnik I tried to add an inline `span_suggestion()` to the error as well, but since generics don't have their own span it becomes too fragile/complicated to work. r? @steveklabnik fixes rust-lang#19477
I've been interested in the accessibility of Rustdoc's output, but never did anything about it. Today, I ran a tool, and it suggested adjusting some colors. Here's some screen shots. Before:  After:  As you can see, the link text is just a _shade_ darker. Browsable: http://www.steveklabnik.com/rust-a11y-doc-testing/doc/std/
…y, r=steveklabnik
E0210 explains about orphan rules and suggests using a local type as a workaround. It wasn't obvious to me that I couldn't use a type alias, so I added a note.
Also change the examples to make this more obvious. Fixes rust-lang#31129.
|
r? @pnkfelix (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors: r+ p=1 |
|
📌 Commit feb2673 has been approved by |
bors
added a commit
that referenced
this pull request
Jan 23, 2016
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.