Skip to content

Rollup of 32 pull requests - #21428

Closed
barosl wants to merge 68 commits into
rust-lang:masterfrom
barosl:rollup
Closed

Rollup of 32 pull requests#21428
barosl wants to merge 68 commits into
rust-lang:masterfrom
barosl:rollup

Conversation

@barosl

Copy link
Copy Markdown
Contributor

arobenand others added 30 commits January 12, 2015 16:18
Now both the enum values and the prose describing them mention the values in the same order.
example:
let m = "hello \
world";
This should have been done together with 56dcbd1
for rust-lang#20361
Signed-off-by: NODA, Kai <nodakai@gmail.com>
Removes extra "the" from the phrase "the the Rust Programming Language
book", which isn't particularly grammatical.
There are a large number of places that incorrectly refer
to deriving in comments, instead of derives.
Fixesrust-lang#20984
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.
Increases the delay of the search box to 500ms after key up. I tried
adding a three character minimum for setting the delay, but didn't find
it very useful.
Should closerust-lang#20095
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.
Only print NOTE warnings if the 'TRAVIS' environment variable has not
been set. Addresses rust-lang#21322.
'x in y' is more Pythonic and faster than 'y.find(x) != -1'.
Signed-off-by: Peter Atashian <retep998@gmail.com>
This is a breaking change. To fix it you should pass the VecMap by value
instead of by reference.
[breaking-change]
Updated `tidy.py` to skip printing NOTEs if the [`TRAVIS`](http://docs.travis-ci.com/user/ci-environment/#Environment-variables) environment variable is set.
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
```
**Breaking change**: `VecMap::into_iter` now consumes the `VecMap`. To fix it you should pass the VecMap by value instead of by reference.
[breaking-change]
r? @gankro
611ef49 removed all the metrics stuff
from tests.mk, but this meant that `PLEASE_BENCH=1` no longer did
anything.
Fixesrust-lang#21324.
This is caught in borrowck now, but catching in typeck is faster and improves diagnostics.
CC rust-lang#17561.
r? @nikomatsakis
…ichton
Multiple people have asked me if this is a reference to Hacker News, and
I _certainly_ don't want to give them that impression.
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @alexcrichton

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

@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+ eace6af p=1

@bors

bors commented Jan 20, 2015

Copy link
Copy Markdown
Collaborator

⌛ Testing commit eace6af with merge b275365...

@bors

bors commented Jan 20, 2015

Copy link
Copy Markdown
Collaborator

💔 Test failed - auto-mac-64-opt

@alexcrichton

Copy link
Copy Markdown
Member

Continued in #21439

bors added a commit that referenced this pull request Jan 20, 2015
@CentrilCentril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollup

Projects

None yet

Development

Successfully merging this pull request may close these issues.

20 participants

@barosl@rust-highfive@alexcrichton@bors@steveklabnik@huonw@Centril@aroben@visualfc@tstorch@nodakai@timparenti@petrochenkov@benjaminp@estsauver@michaelsproul@fenhl@look@glacjay@mneumann