Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of PRs in the queue; Saturday #24328

Merged
merged 58 commits into from
Apr 11, 2015
Merged

Rollup of PRs in the queue; Saturday #24328

merged 58 commits into from
Apr 11, 2015

Conversation

Manishearth
Copy link
Member

No description provided.

Thiago Carvalho and others added 30 commits April 9, 2015 18:07
coherence. Skolemized parameters wind up preventing unification.
Surprised we had no test for this! Fixes rust-lang#24241.
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.
As I go through this, I'm finding some ways that I want to tweak the order.
This doesn't actually display correctly
I decided to break if-let out, as it's too complex for this part, but moving
if that late seems silly too.
This also puts slice patterns in nightly docs, where they belong.
Docs meant that Option is returned though the function returns Result.
Same with integers — docs meant that Option is returned though the function returns Result.
…-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! Fixes rust-lang#24241.

r? @pnkfelix
…=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.
 Fixes 'fn from_str_radix' documentation where docs meant that Option is returned, though the function returns Result.
 Signed-off-by: Tibor Benke <ihrwein@gmail.com>
@Manishearth
Copy link
Member Author

@bors: r+ p=20 force

@bors
Copy link
Collaborator

bors commented Apr 11, 2015

📌 Commit 859c5ed has been approved by Manishearth

@bors
Copy link
Collaborator

bors commented Apr 11, 2015

⌛ Testing commit 859c5ed with merge 51ba118...

@bors
Copy link
Collaborator

bors commented Apr 11, 2015

💔 Test failed - auto-mac-64-opt

@Manishearth
Copy link
Member Author

@bors: r+ p=20 force

@bors
Copy link
Collaborator

bors commented Apr 11, 2015

📌 Commit 0a2885a has been approved by Manishearth

@bors
Copy link
Collaborator

bors commented Apr 11, 2015

⌛ Testing commit 0a2885a with merge 6790b0e...

@bors bors merged commit 0a2885a into rust-lang:master Apr 11, 2015
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.