Skip to content

Rolling up PRs in the queue #21473

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 315 commits into from
Jan 22, 2015
Merged

Rolling up PRs in the queue #21473

merged 315 commits into from
Jan 22, 2015

Conversation

alexcrichton
Copy link
Member

No description provided.

lifthrasiir and others added 30 commits January 18, 2015 03:23
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.
manual rollup to fix some conflicts and diagnose why the test is failing...
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.
File cannot be written, for example, if directory does not exist.

Before this commit:

```
% rustc -o nonexistent/program program.rs
error: could not write output: No such file or directory
```

With this commit:

```
% rustc -o nonexistent/program program.rs
error: could not write output to nonexistent/program.0.o: No such file or directory
```

This is useful when full rust command is not displayed, or when last
error is preceded by thousands of warnings.
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
Lets them build with the -dev, -nightly, or snapshot compiler
The reference should be `x`, not `FOO` itself.
…sue-19986-add-append-and-split-off, r=Gankro

Please review carefully. Contains unsafe and is my first commit to Rust.

Uses ptr::copy_nonoverlapping_memory. Attempts to handle zero-size types correctly.
@bors
Copy link
Collaborator

bors commented Jan 22, 2015

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

@alexcrichton
Copy link
Member Author

@bors: r+ 9b39b6a p=100

@alexcrichton
Copy link
Member Author

@bors: retry

@bors
Copy link
Collaborator

bors commented Jan 22, 2015

⌛ Testing commit 9b39b6a with merge 7eb4233...

@bors
Copy link
Collaborator

bors commented Jan 22, 2015

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

@alexcrichton
Copy link
Member Author

@bors: r+ c0fac91 p=100

1 similar comment
@alexcrichton
Copy link
Member Author

@bors: r+ c0fac91 p=100

@bors
Copy link
Collaborator

bors commented Jan 22, 2015

⌛ Testing commit c0fac91 with merge d9623e2...

@bors
Copy link
Collaborator

bors commented Jan 22, 2015

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

@alexcrichton
Copy link
Member Author

@bors: r+ 90af723 p=100

@bors
Copy link
Collaborator

bors commented Jan 22, 2015

⌛ Testing commit 90af723 with merge 524f035...

@alexcrichton
Copy link
Member Author

cc @michaelwoerister, wasn't sure what to do with this failure so I just ignored the test on windows for now (it's passing locally on linux and OSX)

@bors
Copy link
Collaborator

bors commented Jan 22, 2015

💔 Test failed - auto-linux-32-nopt-t

@alexcrichton
Copy link
Member Author

@bors: retry

@alexcrichton
Copy link
Member Author

cc @cgaebel, @pczarn, @gankro, this failure seems pretty disturbing (internal hashmap error)

@bors
Copy link
Collaborator

bors commented Jan 22, 2015

⌛ Testing commit 90af723 with merge 5d2056a...

@bors
Copy link
Collaborator

bors commented Jan 22, 2015

1 similar comment
@bors
Copy link
Collaborator

bors commented Jan 22, 2015

@bors bors merged commit 90af723 into rust-lang:master Jan 22, 2015
@alexcrichton alexcrichton deleted the rollup branch January 22, 2015 08:59
@cgaebel
Copy link
Contributor

cgaebel commented Jan 22, 2015

@alexcrichton Just ran that test case in a loop with rustc master and can't reproduce. Maybe it was a codegen bug in one of the intermediate patches...?

@alexcrichton
Copy link
Member Author

I've seen it from time to time before (not sure if it's precisely the same assertion). I suspect that it will be pretty hard to reproduce due to the semi-random nature of HashMap. And perhaps it was an intermediate bug! Hard to know anything for sure :(

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.