Rollup of 10 pull requests #25584

steveklabnik · 2015-05-18T21:16:09Z

Successful merges: Update the bison grammar for various language changes and fixes #25337, Make description of Borrow trait uses match the example. #25452, trpl/traits: Make error message consistent with source code snippet #25512, Add 'active' class to current page in rustbook table of contents #25551, typo #25556, Move all version headers to the same level. #25562, trpl: Dining philosophers backstory typo #25575, [doc] Add a reference from PathExt to fs::metadata #25576, TRPL: Add rust Marker to Some Code Block #25580, Add example for from_str_radix #25583
Failed merges:

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#25517

* Correctly lex CRLF in string literals * Update `extern CRATE as NAME` syntax * Allow leading `::` in view paths * Allow TySums in type ascriptions and impls * Allow macros to have visibility and attributes * Update syntax for qualified path types and expressions * Allow block expressions to be called () and indexed []

@steveklabnik

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

@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.

@steveklabnik

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

@steveklabnik

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

@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

Fixes rust-lang#25517

rust-highfive · 2015-05-18T21:16:20Z

r? @alexcrichton

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

steveklabnik · 2015-05-18T21:16:24Z

@bors: r+ p=1

bors · 2015-05-18T21:16:25Z

📌 Commit 1be4156 has been approved by steveklabnik

bors · 2015-05-18T21:30:35Z

⌛ Testing commit 1be4156 with merge e648da0...

bors · 2015-05-18T21:54:24Z

💔 Test failed - auto-linux-64-x-android-t

steveklabnik · 2015-05-18T22:01:47Z

@bors: retry force

bors · 2015-05-18T22:01:51Z

⌛ Testing commit 1be4156 with merge 21fc57e...

bors · 2015-05-18T23:08:07Z

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

Manishearth · 2015-05-19T06:11:06Z


failures:

---- num::from_str_radix_0 stdout ----
    <std macros>:5:22: 5:33 error: mismatched types:
 expected `core::result::Result<u32, core::num::ParseIntError>`,
    found `core::option::Option<_>`
(expected enum `core::result::Result`,
    found enum `core::option::Option`) [E0308]
<std macros>:5 if ! ( * left_val == * right_val ) {
                                    ^~~~~~~~~~~
<std macros>:1:1: 9:39 note: in expansion of assert_eq!
<anon>:2:5: 2:56 note: expansion site
error: aborting due to previous error
thread 'num::from_str_radix_0' panicked at 'Box<Any>', /Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-nopt-t/build/src/libsyntax/diagnostic.rs:211


---- num::from_str_radix_0 stdout ----
    <std macros>:5:22: 5:33 error: mismatched types:
 expected `core::result::Result<u32, core::num::ParseIntError>`,
    found `core::option::Option<_>`
(expected enum `core::result::Result`,
    found enum `core::option::Option`) [E0308]
<std macros>:5 if ! ( * left_val == * right_val ) {
                                    ^~~~~~~~~~~
<std macros>:1:1: 9:39 note: in expansion of assert_eq!
<anon>:2:5: 2:56 note: expansion site
error: aborting due to previous error
thread 'num::from_str_radix_0' panicked at 'Box<Any>', /Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-nopt-t/build/src/libsyntax/diagnostic.rs:211


---- num::from_str_radix_0 stdout ----
    <std macros>:5:22: 5:33 error: mismatched types:
 expected `core::result::Result<u32, core::num::ParseIntError>`,
    found `core::option::Option<_>`
(expected enum `core::result::Result`,
    found enum `core::option::Option`) [E0308]
<std macros>:5 if ! ( * left_val == * right_val ) {
                                    ^~~~~~~~~~~
<std macros>:1:1: 9:39 note: in expansion of assert_eq!
<anon>:2:5: 2:56 note: expansion site
error: aborting due to previous error
thread 'num::from_str_radix_0' panicked at 'Box<Any>', /Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-nopt-t/build/src/libsyntax/diagnostic.rs:211


---- num::from_str_radix_0 stdout ----
    <std macros>:5:22: 5:33 error: mismatched types:
 expected `core::result::Result<u32, core::num::ParseIntError>`,
    found `core::option::Option<_>`
(expected enum `core::result::Result`,
    found enum `core::option::Option`) [E0308]
<std macros>:5 if ! ( * left_val == * right_val ) {
                                    ^~~~~~~~~~~
<std macros>:1:1: 9:39 note: in expansion of assert_eq!
<anon>:2:5: 2:56 note: expansion site
error: aborting due to previous error
thread 'num::from_str_radix_0' panicked at 'Box<Any>', /Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-nopt-t/build/src/libsyntax/diagnostic.rs:211


---- num::from_str_radix_0 stdout ----
    <std macros>:5:22: 5:33 error: mismatched types:
 expected `core::result::Result<u32, core::num::ParseIntError>`,
    found `core::option::Option<_>`
(expected enum `core::result::Result`,
    found enum `core::option::Option`) [E0308]
<std macros>:5 if ! ( * left_val == * right_val ) {
                                    ^~~~~~~~~~~
<std macros>:1:1: 9:39 note: in expansion of assert_eq!
<anon>:2:5: 2:56 note: expansion site
error: aborting due to previous error
thread 'num::from_str_radix_0' panicked at 'Box<Any>', /Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-nopt-t/build/src/libsyntax/diagnostic.rs:211

Manishearth · 2015-05-19T06:13:01Z

steveklabnik@1be4156 needs fixing

bleibig and others added 22 commits May 12, 2015 09:20

Update the bison grammar for various language changes

568d7f1

Make description of Borrow trait uses match the example.

0b04b17

Make error message consistent with source code

55c8bac

The source code uses `"whatever".as_bytes()`, not `b"whatever"`.

Add 'active' class to current page in rustbook table of contents

99868f6

typo

fb73c47

Use byte string literal syntax

a10d243

The byte string literal syntax `b"whatever"` is more idiomatic than `"whatever".as_bytes()`.

Move all version headers to the same level.

a591546

That way old versions won't be a subsections of the 1.0.0 release.

trpl: Dining philosophers backstory typo

83df71d

Minor typo/grammar error.

[doc] Add a reference from PathExt to fs::metadata

b0e3fe9

TRPL: Normalize rust Code Block Markers

f3adea5

`{rust,ignore}` -> `rust,ignore

Add example for from_str_radix

1254c34

Fixes rust-lang#25517

Rollup merge of rust-lang#25452 - jimblandy:master, r=steveklabnik

b940e7b

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

Rollup merge of rust-lang#25512 - peferron:doc-traits-error-fix, r=al…

67bfb48

…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

Rollup merge of rust-lang#25556 - mdinger:patch-1, r=alexcrichton

ffca938

Rollup merge of rust-lang#25562 - svetlyak40wt:patch-1, r=alexcrichton

2c477e0

That way old versions won't be a subsections of the 1.0.0 release.

Rollup merge of rust-lang#25575 - clatour:patch-2, r=steveklabnik

0bf88b2

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

Rollup merge of rust-lang#25576 - mbrubeck:pathext-doc, r=steveklabnik

d4b777e

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

Rollup merge of rust-lang#25583 - steveklabnik:gh25517, r=alexcrichton

1be4156

Fixes rust-lang#25517

rust-highfive assigned alexcrichton May 18, 2015

steveklabnik closed this May 19, 2015

Centril added the rollup A PR which is a rollup label Oct 24, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 10 pull requests #25584

Rollup of 10 pull requests #25584

steveklabnik commented May 18, 2015

rust-highfive commented May 18, 2015

steveklabnik commented May 18, 2015

bors commented May 18, 2015

bors commented May 18, 2015

bors commented May 18, 2015

steveklabnik commented May 18, 2015

bors commented May 18, 2015

bors commented May 18, 2015

Manishearth commented May 19, 2015

Manishearth commented May 19, 2015

Rollup of 10 pull requests #25584

Rollup of 10 pull requests #25584

Conversation

steveklabnik commented May 18, 2015

rust-highfive commented May 18, 2015

steveklabnik commented May 18, 2015

bors commented May 18, 2015

bors commented May 18, 2015

bors commented May 18, 2015

steveklabnik commented May 18, 2015

bors commented May 18, 2015

bors commented May 18, 2015

Manishearth commented May 19, 2015

Manishearth commented May 19, 2015