Uh oh!
There was an error while loading. Please reload this page.
Rollup of 17 pull requests - #24293
Closed
steveklabnik wants to merge 37 commits into
Closed
Conversation
coherence. Skolemized parameters wind up preventing unification. Surprised we had no test for this! Fixesrust-lang#24241.
Fill out blank section headers. Copy edit the entire first section.
A brief introduction to each type, with pointers to the primitive pages for more info.
"highlight end" and instead add a variant to `RenderSpan`
columns within a line, not just the line numbers. Also try to clarify and use the term `line_index` when 0-based.
of text (perhaps obtained by span_snippet) and then splice that edited form back into the original file in the form of a suggestion.
from the current fn. Employ the new `span_suggestion` to show how you can use `move`.
This is very confusing now that these are inherent methods.
…c to be less confusing. Since 0 is the smallest number possible for usize, it doesn't make sense to mention it if it's already included, and it should be more clear that the length of the vector is a valid index with the new wording.
…eklabnik rust-lang#24004 Something like this?
…labnik Now that the new TOC has landed, I've started doing an editing pass to get the old content into the right shape. I felt this introduction was significant enough to send as its own PR, though, as it's the introduction. It's possible that we may just want to replace 'the intro' with this directly, but this PR doesn't do that.
…-message, r=brson Example showing sample inputs, old message, new message: https://gist.github.com/nikomatsakis/11126784ac678b7eb6ba Also adds infrastructure for reporting suggestions "in situ" and does some (minor) cleanups to `CodeMap`. r? @brson
…labnik Fill out blank section headers. Copy edit the entire first section.
…failure, r=pnkfelix Don't use skolemized parameters but rather fresh variables in coherence. Skolemized parameters wind up preventing unification. Surprised we had no test for this! Fixesrust-lang#24241. r? @pnkfelix
…gs, r=huonw keeping on with the edits
…=alexcrichton A brief introduction to each type, with pointers to the primitive pages for more info.
…tsakis This is very confusing now that these are inherent methods.
…labnik ...to be less confusing. Since 0 is the smallest number possible for usize, it doesn't make sense to mention it if it's already included, and it should be more clear that the length of the vector is a valid index with the new wording. r? @steveklabnik
From [here](http://doc.rust-lang.org/nightly/std/primitive.i8.html): > `fn rotate_right(self, n: u32) -> i8` > Shifts the bits to the right by a specified __amount amount__, n, wrapping the truncated bits to the beginning of the resulting integer.
steveklabnik
commented
Apr 10, 2015
ContributorAuthor
@bors: r+ p=100 |
bors
commented
Apr 10, 2015
Collaborator
📌 Commit fbe2ec1 has been approved by |
rust-highfive
commented
Apr 10, 2015
Contributor
(rust_highfive has picked a reviewer for you, use r? to override) |
steveklabnik
commented
Apr 10, 2015
ContributorAuthor
rolling up without @pnkfelix 's patch |
bors
commented
Apr 10, 2015
Collaborator
🔒 Merge conflict |
bors
commented
Apr 10, 2015
Collaborator
☔ The latest upstream changes (presumably #24177) made this pull request unmergeable. Please resolve the merge conflicts. |
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
12 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.
borrowdocs #24240, Improve error message for an escaping closure #24242, Indicate keyword in doc comment is code-like #24243, More editing work on TRPL #24244, Don't use skolemized parameters but rather fresh variables in coherence #24245, Copyediting for 'variable bindings' #24247, Write the 'primitive types' section of TRPL #24253, Add tests for E-needstest issues #24259, Fix pow docs to not use Int #24274, Changed the wording of the documentation for the insert method for Vec ... #24279, Doc: remove a "safety note" made obsolete by dropck for TypedArena #24282, s/Panicks/Panics/ #24283, Fix mistake in documentation #24291