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

Rolling up PRs in the queue #21439

Merged
merged 68 commits into from
Jan 21, 2015
Merged

Rolling up PRs in the queue #21439

merged 68 commits into from
Jan 21, 2015

Conversation

alexcrichton
Copy link
Member

Continuation of #21428

aroben and 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.

Fixes rust-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 close rust-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]
barosl and others added 22 commits January 21, 2015 02:16
…hton

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 close rust-lang#20095

@Jurily, your input is welcome!
The reference should be `x`, not `FOO` itself.
…=alexcrichton

Why not use what is there?
Having both "Right now" and "at the moment" in the same statement is redundant.
…ichton

From std::markers to std::marker.
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.

Fixes rust-lang#21324.
closes rust-lang#21402
cc rust-lang#15294

r? @alexcrichton or @aturon 
cc @ExpHP (btw, this only covers arrays with arity up to 32)
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.
…excrichton

It got accidentially reverted in 44440e5.
@rust-highfive
Copy link
Collaborator

r? @huonw

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

@alexcrichton
Copy link
Member Author

@bors: r+ 631896d p=100

@bors
Copy link
Contributor

bors commented Jan 20, 2015

⌛ Testing commit 631896d with merge 29bd9a0...

bors added a commit that referenced this pull request Jan 20, 2015
@bors bors merged commit 631896d into rust-lang:master Jan 21, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.