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 14 pull requests #38594

Merged
merged 30 commits into from
Dec 25, 2016
Merged

Rollup of 14 pull requests #38594

merged 30 commits into from
Dec 25, 2016

Conversation

wezm and others added 30 commits December 13, 2016 08:41
Small bug fix to remove an unused type in the magenta process code that causes build failures for magenta's rustc.
The Markdown engine used by the book can cope with a single leading space
on the list marker:

    Like this:

     * List item

    Rather than like this:

    * List item

… but it’s not the typical convention employed in the book, and moreover
the Markdown engine used for producing the error index *can’t* cope with
it (its behaviour looks like a bug, as it appears to lose one of the two
line breaks as well, but that’s immaterial here).

So, we shift to a single convention which doesn’t trigger bugs in the
Markdown renderer.
book: replace example I do not understand
…abnik

Simplify notes on testing and concurrency

The start of the notes on tests running concurrently, added in rust-lang#37766 read a little awkwardly. This PR fixes that and simplifies the wording a bit.

r? @steveklabnik
…r=GuillaumeGomez

Advertise Vec in LinkedList docs

r? @steveklabnik

Hi! We already [advise](https://doc.rust-lang.org/std/collections/#use-a-linkedlist-when) to use `Vec` instead of `LinkedList` in the top-level collections documentation. But I think it may be missed by someone who just directly finds `LinkedList`.

What do you feel about advertising `Vec` directly in `LinkedList` docs as well?
Don't @import normalize.css.

This lets the browser load both files in parallel instead of waiting for `rustdoc.css` to load first.
…, r=steveklabnik

rustdoc: properly calculate line length for where clauses

Apparently, while I was cleaning up rust-lang#37190, I regressed the formatting for long where clauses, where it wouldn't take the "prefix" length into account when deciding whether to break the line up. This patch fixes that.
…impls, r=nikomatsakis

ICH: Add test cases for inherent impls.

r? @nikomatsakis
Docs: Explain why/when `.lines()` returns an error

Fix rust-lang#37744.
…ewsxcv

Add missing examples in some thread functions

r? @frewsxcv
…ackler

Removes magenta build warning.

Small bug fix to remove an unused type in the magenta process code that causes build failures for magenta's rustc.

r? @alexcrichton

@tedsta @raphlinus
Create hyperlink to correct documentation

In librustc_trans's readme
…nikomatsakis

incr. comp.: Improve InlineAsm hashing and add test case

r? @nikomatsakis
…frewsxcv

Fix Markdown list formatting.

The Markdown engine used by the book can cope with a single leading space on the list marker:

    Like this:

     * List item

    Rather than like this:

    * List item

… but it’s not the typical convention employed in the book, and moreover the Markdown engine used for producing the error index *can’t* cope with it (its behaviour looks like a bug, as it appears to lose one of the two line breaks as well, but that’s immaterial here).

So, we shift to a single convention which doesn’t trigger bugs in the Markdown renderer.

----

See https://doc.rust-lang.org/error-index.html#E0458 and https://doc.rust-lang.org/error-index.html#E0101 for the bad current rendering in the error index.
@rust-highfive
Copy link
Collaborator

r? @aturon

(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 Dec 24, 2016

📌 Commit df63b0c has been approved by steveklabnik

@bors
Copy link
Contributor

bors commented Dec 24, 2016

⌛ Testing commit df63b0c with merge e60aa62...

bors added a commit that referenced this pull request Dec 24, 2016
Rollup of 14 pull requests

- Successful merges: #37956, #38013, #38297, #38480, #38497, #38502, #38505, #38513, #38521, #38549, #38554, #38557, #38568, #38572
- Failed merges:
@bors bors merged commit df63b0c into rust-lang:master Dec 25, 2016
@steveklabnik steveklabnik deleted the rollup branch December 27, 2016 14:32
@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.