Rollup of 8 pull requests by Manishearth · Pull Request #33494 · rust-lang/rust

Manishearth · 2016-05-08T05:08:15Z

Successful merges: degrade gracefully with empty spans #33369, rustdoc: use btree map for where clauses #33373, Cargo lock tidy check #33404, Improve diagnostics for constants being used in irrefutable patterns #33406, implement RFC 1521 #33420, make dist: specify the archive file as stdout #33424, Implement RFC 1542 #33426, Preparatory refactorings for collector-driven trans. #33473
Failed merges:

to get more reproducible output. Fixes: rust-lang#32555

It's pretty confusing and this error triggers in resolve only when "shadowing" a const, so let's make that clearer.

Adds documentation to Clone, specifying that Copy types should have a trivial Clone impl. Fixesrust-lang#33416.

If the `-f` option isn't given, GNU tar will use environment variable `TAPE` first, and next use the compiled-in default, which isn't necessary `stdout` (it is the tape device `/dev/rst0` under OpenBSD for example).

cc rust-lang#33417

rust-highfive · 2016-05-08T05:08:21Z

r? @jroesch

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

Manishearth · 2016-05-08T05:08:26Z

@bors r+ p=20

bors · 2016-05-08T05:08:28Z

📌 Commit cd9efdf has been approved by Manishearth

bors · 2016-05-08T05:49:23Z

⌛ Testing commit cd9efdf with merge db94e38...

Rollup of 8 pull requests - Successful merges: #33369, #33373, #33404, #33406, #33420, #33424, #33426, #33473 - Failed merges:

bors · 2016-05-08T06:42:52Z

💔 Test failed - auto-linux-64-opt-rustbuild

Manishearth · 2016-05-08T13:30:49Z

@bors r+

bors · 2016-05-08T13:30:50Z

📌 Commit 336ea2c has been approved by Manishearth

bors · 2016-05-08T13:58:24Z

🔒 Merge conflict

…=jntrnr degrade gracefully with empty spans In rust-lang#32756, we solved the final test failure, but digging more into it the handling of that scenario could be better. The error was caused by an empty span supplied by the parser representing EOF. This patch checks that we cope more gracefully with such spans: r? @jonathandturner

rustdoc: use btree map for where clauses to get more reproducible output. Fixes: rust-lang#32555 I've looked at the other uses of HashMap in rustdoc, and they seem ok to (i.e. they use `iter()` and related only for constructing a new map, or when the output goes into independent files). Not sure what the cause of rust-lang#24473 is, it shouldn't be where clauses, but maybe it was also fixed inbetween since May 2015.

Cargo lock tidy check A rebased PR for rust-lang#32901

@steveklabnik

… r=GuillaumeGomez Improve diagnostics for constants being used in irrefutable patterns It's pretty confusing and this error triggers in resolve only when "shadowing" a const, so let's make that clearer. r? @steveklabnik

@ubsan

implement RFC 1521 Adds documentation to Clone, specifying that Copy types should have a trivial Clone impl. Fixesrust-lang#33416. I tried to use "should" and "must" as defined [here](https://tools.ietf.org/html/rfc2119). cc @ubsan

make dist: specify the archive file as stdout If the `-f` option isn't given, GNU tar will use environment variable `TAPE` first, and next use the compiled-in default, which isn't necessary `stdout` (it is the tape device `/dev/rst0` under OpenBSD for example).

@aturon

Implement RFC 1542 cc rust-lang#33417 r? @aturon

Manishearth · 2016-05-08T14:04:13Z

@bors r+ force

bors · 2016-05-08T14:04:14Z

📌 Commit cc98f4c has been approved by Manishearth

bors · 2016-05-08T14:04:17Z

⌛ Testing commit cc98f4c with merge cae42a4...

Rollup of 8 pull requests - Successful merges: #33369, #33373, #33404, #33406, #33420, #33424, #33426, #33473 - Failed merges:

bors · 2016-05-08T16:13:14Z

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-32cross-opt, auto-linux-64-cargotest, auto-linux-64-cross-armhf, auto-linux-64-cross-armsf, auto-linux-64-cross-freebsd, auto-linux-64-cross-netbsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-mir, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-cross-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-mir, auto-win-msvc-64-opt-rustbuild

nikomatsakisand others added 8 commits May 3, 2016 06:15

degrade gracefully with empty spans
f030b5d

rustdoc: use btree map for where clauses
421e6fc
to get more reproducible output. Fixes: rust-lang#32555

add a check to make tidy to ensure cargo lock file is updated
b3de042

Improve diagnostics for constants being used in irrefutable patterns
5f9e304
It's pretty confusing and this error triggers in resolve only when "shadowing" a const, so let's make that clearer.

implement RFC 1521
c5aa879
Adds documentation to Clone, specifying that Copy types should have a trivial Clone impl. Fixesrust-lang#33416.

Add long diagnostics for E0414
9f302b6

specify the archive file as stdout
2111725
If the `-f` option isn't given, GNU tar will use environment variable `TAPE` first, and next use the compiled-in default, which isn't necessary `stdout` (it is the tape device `/dev/rst0` under OpenBSD for example).

Implement RFC 1542
a9779df
cc rust-lang#33417

rust-highfive assigned jroesch May 8, 2016

bors added a commit that referenced this pull request May 8, 2016
Auto merge of#33494- Manishearth:rollup, r=Manishearth
db94e38
Rollup of 8 pull requests - Successful merges: #33369, #33373, #33404, #33406, #33420, #33424, #33426, #33473 - Failed merges:

Manishearth force-pushed the rollup branch from cd9efdf to 336ea2cCompare May 8, 2016 13:10

Manishearth added 7 commits May 8, 2016 07:00

Rollup merge ofrust-lang#33404- gsquire:cargo-lock, r=alexcrichton
0cb966f
Cargo lock tidy check A rebased PR for rust-lang#32901

Rollup merge ofrust-lang#33426- sfackler:try-from, r=aturon
cc98f4c
Implement RFC 1542 cc rust-lang#33417 r? @aturon

Manishearth force-pushed the rollup branch from 336ea2c to cc98f4cCompare May 8, 2016 14:02

bors added a commit that referenced this pull request May 8, 2016
Auto merge of#33494- Manishearth:rollup, r=Manishearth
cae42a4
Rollup of 8 pull requests - Successful merges: #33369, #33373, #33404, #33406, #33420, #33424, #33426, #33473 - Failed merges:

bors merged commit cc98f4c into rust-lang:masterMay 8, 2016

This was referenced May 8, 2016
Librustc_resolve diagnostics fixes #33493
Merged
Move ::std::error to ::core::error#33149
Closed

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

Navigation Menu

Uh oh!

Uh oh!

Rollup of 8 pull requests - #33494

Rollup of 8 pull requests#33494
bors merged 15 commits into
rust-lang:masterfrom
Manishearth:rollup

Manishearth commented May 8, 2016

Uh oh!

rust-highfive commented May 8, 2016

Uh oh!

Manishearth commented May 8, 2016

Uh oh!

bors commented May 8, 2016

Uh oh!

bors commented May 8, 2016

Uh oh!

bors commented May 8, 2016

Uh oh!

Manishearth commented May 8, 2016

Uh oh!

bors commented May 8, 2016

Uh oh!

bors commented May 8, 2016

Uh oh!

Manishearth commented May 8, 2016

Uh oh!

bors commented May 8, 2016

Uh oh!

bors commented May 8, 2016

Uh oh!

bors commented May 8, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

Uh oh!

Uh oh!

Conversation

Manishearth commented May 8, 2016

Uh oh!

rust-highfive commented May 8, 2016

Uh oh!

Manishearth commented May 8, 2016

Uh oh!

bors commented May 8, 2016

Uh oh!

bors commented May 8, 2016

Uh oh!

bors commented May 8, 2016

Uh oh!

Manishearth commented May 8, 2016

Uh oh!

bors commented May 8, 2016

Uh oh!

bors commented May 8, 2016

Uh oh!

Manishearth commented May 8, 2016

Uh oh!

bors commented May 8, 2016

Uh oh!

bors commented May 8, 2016

Uh oh!

bors commented May 8, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants