Rollup of 13 pull requests #21383
Closed
Rollup of 13 pull requests #21383
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
alexcrichton
commented
Jan 19, 2015
alexcrichton
commented
- Successful merges: Grammar tweak to old guide stub documents. #21280, docs: replace deprecated integer suffixes from examples #21355, Update rustdoc man page #21309, Passable nano syntax highlighting #21326, Improve the error message when source file cannot be read #21336, fix an error about the static lifetime #21345, Remove redundant "Right now" #21357, fix formatting #21358, Fix std::marker. #21359, Remove unnecessary explicit conversions from *mut T to *const T #21375, Use 'in' instead of 'find()' in tidy.py #21377, fix string multi line connector '\' for kate syntax rust.xml #21123, Redo Segmented stack support for DragonFly #20991
- Failed merges:
example:
let m = "hello \
world";
Removes extra "the" from the phrase "the the Rust Programming Language book", which isn't particularly grammatical.
Brings the rustdoc man page in sync with the options specified in src/librustdoc/lib.rs. The text was taken verbatim, but I tweaked the order to be (what I think is) somewhat logical.
rust.nanorc provides syntax highlighting for Rust. An attempt has been made to make the syntax highlighting look good on both dark and light terminals. Issue rust-lang#21286.
Contribution from @look!
The reference should be `x`, not `FOO` itself.
It got accidentially reverted in 44440e5.
Having both "Right now" and "at the moment" in the same statement is redundant.
From std::markers to std::marker.
'x in y' is more Pythonic and faster than 'y.find(x) != -1'.
…r=alexcrichton This removes the extra "the" from the phrase "the the Rust Programming Language book", which isn't particularly grammatical, in stub documents introduced in rust-lang#20802 to direct users from the old guides to the corresponding sections of the book.
More [u]int => [i|u]size and [i|u] => [i|u]s changes
…ster Brings the rustdoc man page in sync with the options specified in src/librustdoc/lib.rs. The text was taken verbatim, but I tweaked the order to be (what I think is) somewhat logical. This should close rust-lang#13622.
…callister rust.nanorc provides syntax highlighting for Rust. An attempt has been made to make the syntax highlighting look good on both dark and light terminals. Issue rust-lang#21286. This PR is dedicated to @substars and nano-lovers everywhere.
Contribution from @look! Addresses rust-lang#21329
The reference should be `x`, not `FOO` itself.
Having both "Right now" and "at the moment" in the same statement is redundant.
…ichton From std::markers to std::marker.
After PR rust-lang#19766 added implicit coersions `*mut T -> *const T`, the explicit casts can be removed. (The number of such casts turned out to be relatively small).
`x in y` is more Pythonic than `y.find(x) != -1`. I believe it runs quite a bit faster as well (though it's probably not a bottleneck of the Travis builds):
```bash
$ python -m timeit '"abc".find("a") != -1'
1000000 loops, best of 3: 0.218 usec per loop
$ python -m timeit '"a" in "abc"'
10000000 loops, best of 3: 0.0343 usec per loop
```
example:
let m = "hello \
world";
…excrichton It got accidentially reverted in 44440e5.
|
r? @pcwalton (rust_highfive has picked a reviewer for you, use r? to override) |
|
Just testing out the waters, neat! |
|
Though I found a possible bug. The PRs are not merged in the right order! I will be happy if they are sorted by the PR number. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
16 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.