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

Flip order of const & type #75473

Merged
merged 1 commit into from
Aug 13, 2020
Merged

Conversation

JulianKnodt
Copy link
Contributor

Fix swapped order of consts & types in error message introduced in #74953

r? @varkor cc @lcnr

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 12, 2020
@varkor
Copy link
Member

varkor commented Aug 13, 2020

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 13, 2020

📌 Commit c48d45b has been approved by varkor

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 13, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 13, 2020
Rollup of 11 pull requests

Successful merges:

 - rust-lang#75189 (Fix wasi::fs::OpenOptions to imply write when append is on)
 - rust-lang#75201 (Fix some Clippy warnings in librustc_serialize)
 - rust-lang#75372 (Fix suggestion to use lifetime in type and in assoc const)
 - rust-lang#75400 (Fix minor things in the `f32` primitive docs)
 - rust-lang#75449 (add regression test for rust-lang#74739 (mir const-prop bug))
 - rust-lang#75451 (Clean up E0751 explanation)
 - rust-lang#75455 (Use explicit path link in place for doc in time)
 - rust-lang#75457 (Remove some dead variants in LLVM FFI)
 - rust-lang#75466 (Move to intra doc links whenever possible within std/src/lib.rs)
 - rust-lang#75469 (Switch to intra-doc links in `std/io/mod.rs`)
 - rust-lang#75473 (Flip order of const & type)

Failed merges:

r? @ghost
@bors bors merged commit 76ac5d6 into rust-lang:master Aug 13, 2020
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants