Skip to content

Rollup of 11 pull requests #25605

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

Merged
merged 24 commits into from
May 19, 2015
Merged

Rollup of 11 pull requests #25605

merged 24 commits into from
May 19, 2015

Conversation

jimblandy and others added 24 commits May 15, 2015 12:44
The source code uses `"whatever".as_bytes()`, not `b"whatever"`.
The byte string literal syntax `b"whatever"` is more idiomatic than
`"whatever".as_bytes()`.
That way old versions won't be a subsections of the 1.0.0 release.
Minor typo/grammar error.
This adds strictly more information to the source files and reduces the
need for customized tooling to render the book.

(While this should not change the output of _rustbook_, it is very
useful when rendering the sources with external tools like Pandoc.)
`{rust,ignore}` -> `rust,ignore
Fixes rust-lang#24655

Margin for associated types was applied to type aliases (in return
value) by mistake.
fixed a mistake.
Minor tweak: the text explaining the Borrow trait talks about slices, but the example immediately following just uses a simple reference; there are no slices involved.

r? @steveklabnik
…excrichton

The source code snippet uses `"whatever".as_bytes()` but the compilation error message uses `b"whatever"`. Both should be consistent with each other.

r? @steveklabnik
…toc, r=alexcrichton

Currently the table of contents for `rustbook` doesn't signify which page you are on.

This PR adds an 'active' class to the link for the current page, and defines the CSS rule for that class to make the link underlined and bold.

Not sure about two things:
1) Is `current_page` is a good name for the function parameter? At first I thought `current_item` would be good, but then in the `walk_item` function, you'd have `item` and `current_item`.

2) For the CSS, is both bold and underline too much? At first I had it just be underlined, but that's also how the links look when they're hovered over.
That way old versions won't be a subsections of the 1.0.0 release.
Looks like this was an issue in the source material. I've let the editor know and he has told me he is correcting it there as well.

r? @steveklabnik
This has been a frequently-asked question on IRC, and it isn't obvious where to
look for the fix.  r? @steveklabnik
…=steveklabnik

This adds strictly more information to the source files and reduces the need for customized tooling to render the book. (While this should not change the output of _rustbook_, it is very useful when rendering the sources with external tools like Pandoc.)

This only adds the language marker to "first level" code blocks (and not to code blocks in comments inside of code examples).

r? @steveklabnik
…ichton

rustdoc: Fix left margin for type aliases

Fixes rust-lang#24655

Margin for associated types was applied to type aliases (in return
value) by mistake.
…cs, r=Manishearth

Part of rust-lang#24407.

This covers various errors to do with struct and enum patterns.
@Manishearth
Copy link
Member Author

@bors: r+ p=20

@bors
Copy link
Collaborator

bors commented May 19, 2015

📌 Commit 3bb54a3 has been approved by Manishearth

@rust-highfive
Copy link
Contributor

r? @brson

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

@bors
Copy link
Collaborator

bors commented May 19, 2015

⌛ Testing commit 3bb54a3 with merge aca207a...

bors added a commit that referenced this pull request May 19, 2015
@bors bors merged commit 3bb54a3 into rust-lang:master May 19, 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.