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

Fix try-op diagnostic in E0277 for methods #68425

Merged
merged 3 commits into from
Jan 23, 2020
Merged

Fix try-op diagnostic in E0277 for methods #68425

merged 3 commits into from
Jan 23, 2020

Conversation

phi-gamma
Copy link
Contributor

For methods the try-op diagnostic displays the empty string where
it has more descriptive strings like “a function” otherwise:

error[E0277]: the `?` operator can only be used in  that returns `Result` or `Option` (or another type that implements `std::ops::Try`)
                                                  ^^
   | |             ^^ cannot use the `?` operator in  that returns `()`
                                                    ^^

I’m seeing this on nightly (rustc 1.42.0-nightly (b5a3341
2020-01-20)) and on the playpen.

The changeset add strings for impl methods and trait provided
methods and test cases for the option type.

@phi-gamma
Handle methods in try diagnostic
5dee7dd 
The diagnostic for diagnostic for methods and trait provided
methods would only show the empty string:

    error[E0277]: the `?` operator can only be used in  that returns `Result` or `Option` (or another type that implements `std::ops::Try`)

Handle the missing cases so it reads ``a method'' / ``an async
method'' / ``a trait method'' respectively.

Signed-off-by: Philipp Gesang <phg@phi-gamma.net>
@phi-gamma
Test try diagnostics for impl and trait methods
02e66ba 
Signed-off-by: Philipp Gesang <phg@phi-gamma.net>
@rust-highfive
Copy link
Collaborator

r? @eddyb

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 21, 2020
@phi-gamma
Cleanup: rewrite conditional as match
db3b40c 
As suggested by @Centril.

Signed-off-by: Philipp Gesang <phg@phi-gamma.net>
@varkor
Copy link
Member

varkor commented Jan 21, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Jan 21, 2020

📌 Commit db3b40c 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 Jan 21, 2020
@varkor varkor assigned varkor and unassigned eddyb Jan 21, 2020
tmandry added a commit to tmandry/rust that referenced this pull request Jan 22, 2020
@tmandry
Rollup merge of rust-lang#68425 - phi-gamma:try-method, r=varkor
41b00c0 
Fix try-op diagnostic in E0277 for methods

For methods the try-op diagnostic displays the empty string where
it has more descriptive strings like “a function” otherwise:

    error[E0277]: the `?` operator can only be used in  that returns `Result` or `Option` (or another type that implements `std::ops::Try`)
                                                      ^^
       | |             ^^ cannot use the `?` operator in  that returns `()`
                                                        ^^

I’m seeing this on nightly (rustc 1.42.0-nightly (b5a3341
2020-01-20)) and [on the playpen](https://play.rust-lang.org/?version=stable&mode=debug&edition=2018&gist=0e7ce7792c2aceb8056941710d539124).

The changeset add strings for impl methods and trait provided
methods and test cases for the option type.
@tmandry tmandry mentioned this pull request Jan 22, 2020
Closed
tmandry added a commit to tmandry/rust that referenced this pull request Jan 22, 2020
@tmandry
Rollup merge of rust-lang#68425 - phi-gamma:try-method, r=varkor
08558ac 
Fix try-op diagnostic in E0277 for methods

For methods the try-op diagnostic displays the empty string where
it has more descriptive strings like “a function” otherwise:

    error[E0277]: the `?` operator can only be used in  that returns `Result` or `Option` (or another type that implements `std::ops::Try`)
                                                      ^^
       | |             ^^ cannot use the `?` operator in  that returns `()`
                                                        ^^

I’m seeing this on nightly (rustc 1.42.0-nightly (b5a3341
2020-01-20)) and [on the playpen](https://play.rust-lang.org/?version=stable&mode=debug&edition=2018&gist=0e7ce7792c2aceb8056941710d539124).

The changeset add strings for impl methods and trait provided
methods and test cases for the option type.
@tmandry tmandry mentioned this pull request Jan 22, 2020
Closed
tmandry added a commit to tmandry/rust that referenced this pull request Jan 22, 2020
@tmandry
Rollup merge of rust-lang#68425 - phi-gamma:try-method, r=varkor
80b5eaf 
Fix try-op diagnostic in E0277 for methods

For methods the try-op diagnostic displays the empty string where
it has more descriptive strings like “a function” otherwise:

    error[E0277]: the `?` operator can only be used in  that returns `Result` or `Option` (or another type that implements `std::ops::Try`)
                                                      ^^
       | |             ^^ cannot use the `?` operator in  that returns `()`
                                                        ^^

I’m seeing this on nightly (rustc 1.42.0-nightly (b5a3341
2020-01-20)) and [on the playpen](https://play.rust-lang.org/?version=stable&mode=debug&edition=2018&gist=0e7ce7792c2aceb8056941710d539124).

The changeset add strings for impl methods and trait provided
methods and test cases for the option type.
@tmandry tmandry mentioned this pull request Jan 22, 2020
Closed
tmandry added a commit to tmandry/rust that referenced this pull request Jan 23, 2020
@tmandry
Rollup merge of rust-lang#68425 - phi-gamma:try-method, r=varkor
1077ada 
Fix try-op diagnostic in E0277 for methods

For methods the try-op diagnostic displays the empty string where
it has more descriptive strings like “a function” otherwise:

    error[E0277]: the `?` operator can only be used in  that returns `Result` or `Option` (or another type that implements `std::ops::Try`)
                                                      ^^
       | |             ^^ cannot use the `?` operator in  that returns `()`
                                                        ^^

I’m seeing this on nightly (rustc 1.42.0-nightly (b5a3341
2020-01-20)) and [on the playpen](https://play.rust-lang.org/?version=stable&mode=debug&edition=2018&gist=0e7ce7792c2aceb8056941710d539124).

The changeset add strings for impl methods and trait provided
methods and test cases for the option type.
@tmandry tmandry mentioned this pull request Jan 23, 2020
Merged
bors added a commit that referenced this pull request Jan 23, 2020
@bors
Auto merge of #68474 - tmandry:rollup-6gmbet6, r=tmandry
e23dd66 
Rollup of 10 pull requests

Successful merges:

 - #67195 ([experiment] Add `-Z no-link` flag)
 - #68253 (add bare metal ARM Cortex-A targets to rustc)
 - #68361 (Unbreak linking with lld 9 on FreeBSD 13.0-CURRENT i386)
 - #68388 (Make `TooGeneric` error in WF checking a proper error)
 - #68409 (Micro-optimize OutputFilenames)
 - #68410 (Export weak symbols used by MemorySanitizer)
 - #68425 (Fix try-op diagnostic in E0277 for methods)
 - #68440 (bootstrap: update clippy subcmd decription)
 - #68441 (pprust: use as_deref)
 - #68462 (librustc_mir: don't allocate vectors where slices will do.)

Failed merges:

r? @ghost
@bors bors merged commit db3b40c into rust-lang:master Jan 23, 2020
@phi-gamma
Copy link
Contributor Author

Thanks everyone, thanks Bors!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Centril Centril Centril left review comments

Assignees

@varkor varkor

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@phi-gamma @rust-highfive @varkor @bors @Centril @eddyb