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 12 pull requests #24265

Closed
wants to merge 27 commits into from
Closed

Conversation

Thiago Carvalho and others added 27 commits April 9, 2015 18:07
coherence. Skolemized parameters wind up preventing unification.
Surprised we had no test for this! Fixes rust-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`.
…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! Fixes rust-lang#24241.

r? @pnkfelix
…=alexcrichton

A brief introduction to each type, with pointers to the primitive pages
for more info.
@rust-highfive
Copy link
Collaborator

r? @brson

(rust_highfive has picked a reviewer for you, use r? to override)

@steveklabnik
Copy link
Member Author

@bors: r+ p=1

@bors
Copy link
Contributor

bors commented Apr 10, 2015

📌 Commit 2cb82b6 has been approved by steveklabnik

@steveklabnik steveklabnik assigned steveklabnik and unassigned brson Apr 10, 2015
@bors
Copy link
Contributor

bors commented Apr 10, 2015

⌛ Testing commit 2cb82b6 with merge 1089011...

bors added a commit that referenced this pull request Apr 10, 2015
@bors
Copy link
Contributor

bors commented Apr 10, 2015

💔 Test failed - auto-linux-64-nopt-t

@Centril Centril added the rollup A PR which is a rollup label Oct 24, 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.

10 participants