Rollup of 14 pull requests by Manishearth · Pull Request #33376 · rust-lang/rust

Manishearth · 2016-05-03T13:39:10Z

Successful merges: Fix std::fmt format spec: named args are allowed with "$" syntax #33277, Add detailed error explanation for E0501 #33294, mk: Fix building with --enable-ccache #33314, doc/book/getting-started.md: Spelling correction and revised wording. #33322, parser: show a helpful note on unexpected inner comment #33333, typeck: limit number of candidates shown for a single error #33338, fix various const eval errors #33339, resolve: print location of static for "static in pattern" error #33340, parser: change warning into an error on T<A=B, C> #33343, libcore: Inline mem::forget(). #33357, fix built-in target detection #33363, Makefile: there is only one tidy target now #33365, rustdoc: fix inserting source code spans for constant values #33371, rustdoc: HTML-escape Rust code (from constants) #33372
Failed merges:

…cutable from 'Converting to Cargo'.

There was no span available in the cast function, but we need to infer the `x` in `x as char` to `u8`. The spans are now removed from all functions using `infer` and instead added in `eval_const_expr_partial`

The implementation mirrors the one for "constant defined here" annotation used for constant patterns in the irrefutable-pattern case. Fixes: rust-lang#23716

Was causing severe performance problems in WebRender.

This will go wrong when the constants partially result from macro expansion. Instead, use the expressions and pretty-print them as Rust code. Fixes: rust-lang#33302

Especially in cases like the one in the test file, this can blow up the docs big time if string constants in the code contain HTML. But also other constants can contain special chars (e.g. `&` as an operator in constant expressions).

rust-highfive · 2016-05-03T13:39:22Z

r? @nrc

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

Manishearth · 2016-05-03T13:39:27Z

@bors r+ force

bors · 2016-05-03T13:39:27Z

📌 Commit b34d41c has been approved by Manishearth

Manishearth · 2016-05-03T13:39:45Z

@bors p=20 force

Manishearth · 2016-05-03T13:40:22Z

@bors force

Manishearth · 2016-05-03T13:42:48Z

@bors force

bors · 2016-05-03T13:43:11Z

⌛ Testing commit b34d41c with merge 75f98ce...

Manishearth · 2016-05-03T13:52:22Z

@bors r+ force

bors · 2016-05-03T13:52:23Z

📌 Commit 54933f2 has been approved by Manishearth

bors · 2016-05-03T13:54:25Z

⌛ Testing commit 54933f2 with merge 2efd47c...

bors · 2016-05-03T14:04:18Z

💔 Test failed - auto-win-msvc-64-opt-mir

bors · 2016-05-03T19:13:29Z

💔 Test failed - auto-win-gnu-32-nopt-t

steveklabnik · 2016-05-03T20:40:29Z

@bors: retry clean

bors · 2016-05-03T21:49:02Z

⌛ Testing commit 631e7b4 with merge f7125fc...

Rollup of 14 pull requests - Successful merges: #33277, #33294, #33314, #33322, #33333, #33338, #33339, #33340, #33343, #33357, #33363, #33365, #33371, #33372 - Failed merges:

bors · 2016-05-03T23:14:01Z

💔 Test failed - auto-win-gnu-32-opt

Manishearth · 2016-05-03T23:16:02Z

@bors retry force

Manishearth · 2016-05-03T23:16:23Z

@bors force

bors · 2016-05-03T23:16:29Z

⚡ Previous build results for 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-opt-rustbuild, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-cross-ios-opt, auto-win-gnu-32-opt-rustbuild, auto-win-msvc-32-cross-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt-rustbuild are reusable. Rebuilding only auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-mir, auto-linux-64-x-android-t, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-opt, auto-win-msvc-64-opt-mir...

bors · 2016-05-04T09:26:36Z

💥 Test timed out

steveklabnik · 2016-05-04T14:35:22Z

@bors: retry force

alexcrichton · 2016-05-04T16:50:56Z

@bors: retry

bors · 2016-05-04T17:10:28Z

⌛ Testing commit 631e7b4 with merge 1895d08...

Rollup of 14 pull requests - Successful merges: #33277, #33294, #33314, #33322, #33333, #33338, #33339, #33340, #33343, #33357, #33363, #33365, #33371, #33372 - Failed merges:

bors · 2016-05-04T19:25:39Z

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

alexcrichton · 2016-05-04T20:32:15Z

@bors: retry

bors · 2016-05-04T20:33:00Z

⚡ Previous build results for auto-linux-32cross-opt, auto-linux-64-cargotest, auto-linux-64-cross-netbsd, auto-linux-64-opt-rustbuild, auto-linux-cross-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt-rustbuild, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt-rustbuild are reusable. Rebuilding only auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cross-armhf, auto-linux-64-cross-armsf, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-mir, auto-linux-64-x-android-t, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, 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-opt, auto-win-msvc-64-opt-mir...

alexcrichton · 2016-05-04T21:26:26Z

@bors: retry force clean

bors · 2016-05-04T21:26:29Z

⌛ Testing commit 631e7b4 with merge 7a0ccc4...

Rollup of 14 pull requests - Successful merges: #33277, #33294, #33314, #33322, #33333, #33338, #33339, #33340, #33343, #33357, #33363, #33365, #33371, #33372 - Failed merges:

bors · 2016-05-05T00:38:37Z

☀️ 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

steveklabnik · 2016-05-05T01:17:56Z

🎉🎊🙌

On May 4, 2016, 20:38 -0400, borsnotifications@github.com, wrote:

Merged#33376(#33376).
—
You are receiving this because you commented.
Reply to this email directly orview it on GitHub(#33376 (comment))

birkenfeldand others added 14 commits April 29, 2016 21:17

Fix std::fmt format spec: named args are allowed with "$" syntax
84bd1ce

doc/book/getting-started.md: Corrected spelling of 'Internet'.
538098c

Add error explanation for E0501
3f49920

doc/book/getting-started.md: Removed references to creating a new exe…
018c595
…cutable from 'Converting to Cargo'.

remove unused constant error variants
12c4a19

check for wrong const_err warnings
bf51eaf

parser: change warning into an error on T<A=B, C>
98d991f
Fixes: rust-lang#32214

* as char assumes * to be of type u8
10737a5

tests
f080b13

refactor infer function
ce6ea47
There was no span available in the cast function, but we need to infer the `x` in `x as char` to `u8`. The spans are now removed from all functions using `infer` and instead added in `eval_const_expr_partial`

resolve: print location of static for "static in pattern" error
4ba6bf4
The implementation mirrors the one for "constant defined here" annotation used for constant patterns in the irrefutable-pattern case. Fixes: rust-lang#23716

libcore: Inline mem::forget().
237eb72
Was causing severe performance problems in WebRender.

rustdoc: fix inserting source code spans for constant values
24117f3
This will go wrong when the constants partially result from macro expansion. Instead, use the expressions and pretty-print them as Rust code. Fixes: rust-lang#33302

rustdoc: HTML-escape Rust code (from constants)
1bcf41e
Especially in cases like the one in the test file, this can blow up the docs big time if string constants in the code contain HTML. But also other constants can contain special chars (e.g. `&` as an operator in constant expressions).

rust-highfive assigned nrc May 3, 2016

Manishearth force-pushed the rollup branch from b34d41c to 54933f2Compare May 3, 2016 13:52

Manishearth force-pushed the rollup branch from 54933f2 to 8d23944Compare May 3, 2016 14:08

bors mentioned this pull request May 3, 2016
Add more aliases for Unicode confusable chars #33128
Merged

alexcrichton mentioned this pull request May 3, 2016
Spurious JSON parsing failure on bots #33390
Closed

This was referenced May 4, 2016
degrade gracefully with empty spans #33369
Merged
Replace copy-pasted variable name with relevant one #33402
Merged

bors merged commit 631e7b4 into rust-lang:masterMay 5, 2016

This was referenced May 5, 2016
Add error explanation for E0502 #33353
Merged
Add detailed error explanation for E0506 #33384
Merged
Add detailed error explanation for E0504 #33386
Merged

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

Uh oh!

Uh oh!

Conversation

Manishearth commented May 3, 2016

Uh oh!

rust-highfive commented May 3, 2016

Uh oh!

Manishearth commented May 3, 2016

Uh oh!

bors commented May 3, 2016

Uh oh!

Manishearth commented May 3, 2016

Uh oh!

Manishearth commented May 3, 2016

Uh oh!

Manishearth commented May 3, 2016

Uh oh!

bors commented May 3, 2016

Uh oh!

Manishearth commented May 3, 2016

Uh oh!

bors commented May 3, 2016

Uh oh!

bors commented May 3, 2016

Uh oh!

bors commented May 3, 2016

Uh oh!

bors commented May 3, 2016

Uh oh!

steveklabnik commented May 3, 2016

Uh oh!

bors commented May 3, 2016

Uh oh!

bors commented May 3, 2016

Uh oh!

Manishearth commented May 3, 2016

Uh oh!

Manishearth commented May 3, 2016

Uh oh!

bors commented May 3, 2016

Uh oh!

bors commented May 4, 2016

Uh oh!

steveklabnik commented May 4, 2016

Uh oh!

alexcrichton commented May 4, 2016

Uh oh!

bors commented May 4, 2016

Uh oh!

bors commented May 4, 2016

Uh oh!

alexcrichton commented May 4, 2016

Uh oh!

bors commented May 4, 2016

Uh oh!

alexcrichton commented May 4, 2016

Uh oh!

bors commented May 4, 2016

Uh oh!

bors commented May 5, 2016

Uh oh!

steveklabnik commented May 5, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants