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.

Sign up for GitHub

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

Jump to bottom

Rollup of 14 pull requests #33376

Merged
merged 23 commits into from
May 5, 2016
Merged

Rollup of 14 pull requests #33376

merged 23 commits into from
May 5, 2016

Conversation

Manishearth
Copy link
Member

birkenfeld and others added 14 commits April 29, 2016 21:17
@birkenfeld
Fix std::fmt format spec: named args are allowed with "$" syntax
84bd1ce
@justsostephen
doc/book/getting-started.md: Corrected spelling of 'Internet'.
538098c
Add error explanation for E0501
3f49920
@justsostephen
doc/book/getting-started.md: Removed references to creating a new exe…
018c595 
…cutable from 'Converting to Cargo'.
@oli-obk
remove unused constant error variants
12c4a19
@oli-obk
check for wrong const_err warnings
bf51eaf
@birkenfeld
parser: change warning into an error on T<A=B, C>
98d991f 
Fixes: rust-lang#32214
@oli-obk
* as char assumes * to be of type u8
10737a5
@oli-obk
tests
f080b13
@oli-obk
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`
@birkenfeld
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
@pcwalton
libcore: Inline mem::forget().
237eb72 
Was causing severe performance problems in WebRender.
@birkenfeld
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
@birkenfeld
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
Copy link
Collaborator

r? @nrc

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

@Manishearth
Copy link
Member Author

@bors r+ force

@bors
Copy link
Contributor

bors commented May 3, 2016

📌 Commit b34d41c has been approved by Manishearth

@Manishearth
Copy link
Member Author

@bors p=20 force

@Manishearth
Copy link
Member Author

@bors force

1 similar comment
@Manishearth
Copy link
Member Author

@bors force

@bors
Copy link
Contributor

bors commented May 3, 2016

⌛ Testing commit b34d41c with merge 75f98ce...

@Manishearth
Copy link
Member Author

@bors r+ force

@bors
Copy link
Contributor

bors commented May 3, 2016

📌 Commit 54933f2 has been approved by Manishearth

@bors
Copy link
Contributor

bors commented May 3, 2016

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

@bors
Copy link
Contributor

bors commented May 3, 2016

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

@bors bors mentioned this pull request May 3, 2016
Merged
@bors
Copy link
Contributor

bors commented May 3, 2016

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

@steveklabnik
Copy link
Member

@bors: retry clean

@alexcrichton alexcrichton mentioned this pull request May 3, 2016
Closed
@bors
Copy link
Contributor

bors commented May 3, 2016

⌛ Testing commit 631e7b4 with merge f7125fc...

bors added a commit that referenced this pull request May 3, 2016
@bors
Auto merge of #33376 - Manishearth:rollup, r=Manishearth
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
Copy link
Contributor

bors commented May 3, 2016

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

@Manishearth
Copy link
Member Author

@bors retry force

@Manishearth
Copy link
Member Author

@bors force

@bors
Copy link
Contributor

bors commented May 3, 2016

⚡ 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
Copy link
Contributor

bors commented May 4, 2016

💥 Test timed out

@steveklabnik
Copy link
Member

@bors: retry force

@alexcrichton
Copy link
Member

@bors: retry

@bors
Copy link
Contributor

bors commented May 4, 2016

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

bors added a commit that referenced this pull request May 4, 2016
@bors
Auto merge of #33376 - Manishearth:rollup, r=Manishearth
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
Copy link
Contributor

bors commented May 4, 2016

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

@alexcrichton
Copy link
Member

@bors: retry

@bors
Copy link
Contributor

bors commented May 4, 2016

⚡ 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
Copy link
Member

@bors: retry force clean

@bors
Copy link
Contributor

bors commented May 4, 2016

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

bors added a commit that referenced this pull request May 4, 2016
@bors
Auto merge of #33376 - Manishearth:rollup, r=Manishearth
7a0ccc4 
Rollup of 14 pull requests

- Successful merges: #33277, #33294, #33314, #33322, #33333, #33338, #33339, #33340, #33343, #33357, #33363, #33365, #33371, #33372
- Failed merges:
This was referenced May 4, 2016
Merged
Merged
@bors
Copy link
Contributor

bors commented May 5, 2016

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

@bors bors merged commit 631e7b4 into rust-lang:master May 5, 2016
This was referenced May 5, 2016
Merged
Merged
Merged
@steveklabnik
Copy link
Member

🎉🎊🙌

On May 4, 2016, 20:38 -0400, [email protected], wrote:

Merged#33376(#33376).

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

@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nrc nrc

Labels
rollup A PR which is a rollup
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.