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

Fix incorrect outer function type parameter message #53960

Merged
merged 3 commits into from Sep 9, 2018

Conversation

Projects
None yet
5 participants
@estebank
Contributor

estebank commented Sep 5, 2018

Fix #51303.

@rust-highfive

This comment has been minimized.

Show comment
Hide comment
@rust-highfive

rust-highfive Sep 5, 2018

Collaborator

r? @varkor

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

Collaborator

rust-highfive commented Sep 5, 2018

r? @varkor

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

@estebank

This comment has been minimized.

Show comment
Hide comment
@estebank

estebank Sep 5, 2018

Contributor

[do not merge yet] I think it'd be nice if we actually provided a suggestion to use whatever Self is when possible (impl Foo should suggest Foo, while impl Bar for Foo should keep the current diagnostic).

cc @nagisa

Contributor

estebank commented Sep 5, 2018

[do not merge yet] I think it'd be nice if we actually provided a suggestion to use whatever Self is when possible (impl Foo should suggest Foo, while impl Bar for Foo should keep the current diagnostic).

cc @nagisa

@nagisa

This comment has been minimized.

Show comment
Hide comment
@nagisa

nagisa Sep 5, 2018

Contributor

This seems good to merge with fixed wording.

Contributor

nagisa commented Sep 5, 2018

This seems good to merge with fixed wording.

@estebank

This comment has been minimized.

Show comment
Hide comment
@estebank

estebank Sep 6, 2018

Contributor

@bors r=nagisa

Contributor

estebank commented Sep 6, 2018

@bors r=nagisa

@bors

This comment has been minimized.

Show comment
Hide comment
@bors

bors Sep 6, 2018

Contributor

📌 Commit bebecf8 has been approved by nagisa

Contributor

bors commented Sep 6, 2018

📌 Commit bebecf8 has been approved by nagisa

kennytm added a commit to kennytm/rust that referenced this pull request Sep 7, 2018

Rollup merge of #53960 - estebank:issue-51303, r=nagisa
Fix incorrect outer function type parameter message

Fix #51303.

@kennytm kennytm referenced this pull request Sep 7, 2018

Closed

Rollup of 9 pull requests #54036

bors added a commit that referenced this pull request Sep 7, 2018

Auto merge of #54036 - kennytm:rollup, r=kennytm
Rollup of 10 pull requests

Successful merges:

 - #51366 (stabilize #[panic_handler])
 - #53162 (rustdoc: collect trait impls as an early pass)
 - #53705 (#53576 Renaming TyAnon -> TyOpaque)
 - #53829 (Add rustc SHA to released DWARF debuginfo)
 - #53932 ([NLL] Remove base_place)
 - #53960 (Fix incorrect outer function type parameter message)
 - #53973 (Have rust-lldb look for the rust-enabled lldb)
 - #53987 (rustbuild: allow configuring llvm version suffix)
 - #53993 (rustc_resolve: don't record uniform_paths canaries as reexports.)
 - #53999 (Stabilize 2018 edition)

Failed merges:

r? @ghost

kennytm added a commit to kennytm/rust that referenced this pull request Sep 7, 2018

Rollup merge of #53960 - estebank:issue-51303, r=nagisa
Fix incorrect outer function type parameter message

Fix #51303.

bors added a commit that referenced this pull request Sep 7, 2018

Auto merge of #54036 - kennytm:rollup, r=kennytm
Rollup of 9 pull requests

Successful merges:

 - #51366 (stabilize #[panic_handler])
 - #53162 (rustdoc: collect trait impls as an early pass)
 - #53705 (#53576 Renaming TyAnon -> TyOpaque)
 - #53932 ([NLL] Remove base_place)
 - #53960 (Fix incorrect outer function type parameter message)
 - #53973 (Have rust-lldb look for the rust-enabled lldb)
 - #53987 (rustbuild: allow configuring llvm version suffix)
 - #53993 (rustc_resolve: don't record uniform_paths canaries as reexports.)
 - #53999 (Stabilize 2018 edition)

Failed merges:

r? @ghost

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Sep 8, 2018

Rollup merge of #53960 - estebank:issue-51303, r=nagisa
Fix incorrect outer function type parameter message

Fix #51303.

bors added a commit that referenced this pull request Sep 8, 2018

Auto merge of #54068 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
Rollup of 11 pull requests

Successful merges:

 - #53851 (Limit the promotion of const fns to the libstd and the `rustc_promotable` attribute)
 - #53949 (Improve messages for un-closed delimiter errors)
 - #53960 (Fix incorrect outer function type parameter message)
 - #53988 (rustc_resolve: only prepend CrateRoot to a non-keyword segment.)
 - #53995 (Too many errors for incorrect move in loop with NLL enabled)
 - #53998 (rustc_codegen_llvm: don't assume offsets are always aligned.)
 - #54000 (Allow named lifetimes in async functions.)
 - #54011 (rustc_resolve: inject `uniform_paths` canary always on Rust 2018.)
 - #54024 (Fix compiling some rustc crates to wasm)
 - #54057 (Stabilize edition 2018; also updates Clippy and RLS)
 - #54064 (`&CStr`, not `CStr`, is the counterpart of `&str`)

Failed merges:

 - #54031 (A few cleanups and minor improvements to rustc_passes)

r? @ghost
@bors

This comment has been minimized.

Show comment
Hide comment
@bors

bors Sep 9, 2018

Contributor

⌛️ Testing commit bebecf8 with merge dac7602...

Contributor

bors commented Sep 9, 2018

⌛️ Testing commit bebecf8 with merge dac7602...

bors added a commit that referenced this pull request Sep 9, 2018

Auto merge of #53960 - estebank:issue-51303, r=nagisa
Fix incorrect outer function type parameter message

Fix #51303.
@bors

This comment has been minimized.

Show comment
Hide comment
@bors

bors Sep 9, 2018

Contributor

☀️ Test successful - status-appveyor, status-travis
Approved by: nagisa
Pushing dac7602 to master...

Contributor

bors commented Sep 9, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: nagisa
Pushing dac7602 to master...

@bors bors merged commit bebecf8 into rust-lang:master Sep 9, 2018

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment