Skip to content

Fix #98260 #98642

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
Merged
merged 1 commit into from
Jun 29, 2022
Merged

Fix #98260 #98642

merged 1 commit into from
Jun 29, 2022

Conversation

yanchen4791
Copy link
Contributor

@yanchen4791 yanchen4791 commented Jun 28, 2022 •
edited by spastorino
Loading

Fixes #98260

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jun 28, 2022
@rust-highfive
Copy link
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @petrochenkov (or someone else) soon.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 28, 2022
@compiler-errors
Copy link
Member

@yanchen4791 this needs a test at least

@yanchen4791
Copy link
Contributor Author

Please note that the fix is for #98260 (not 98062).

@spastorino
Copy link
Member

spastorino commented Jun 28, 2022 •
edited
Loading

@yanchen4791 you would probably want to place a test somewhere inside src/test/ui/ with the following ...

fn main() {}

trait A {
    fn a(aa: B) -> Result<_, B> {
        Ok(())
    }
}

enum B {}

And proper error proves. Check how tests are layed out in src/test/ui

@spastorino
Copy link
Member

And you would need to rustfmt the changed file.

@yanchen4791
Copy link
Contributor Author

@yanchen4791 this needs a test at least

@compiler-errors A test case has been added.

@spastorino
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 29, 2022

📌 Commit f97326d has been approved by spastorino

@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 Jun 29, 2022
@jackh726
Copy link
Member

@bors rollup=never

This might have a perf effect

@matthiaskrgr matthiaskrgr mentioned this pull request Jun 29, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 29, 2022
@bors
Auto merge of rust-lang#98680 - matthiaskrgr:rollup-1bkrrn9, r=matthi…
ddcbba0 
…askrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#98434 (Ensure that `static_crt` is set in the bootstrapper whenever using `cc-rs` to get a compiler command line.)
 - rust-lang#98636 (Triagebot: Fix mentions word wrapping.)
 - rust-lang#98642 (Fix rust-lang#98260)
 - rust-lang#98643 (Improve pretty printing of valtrees for references)
 - rust-lang#98646 (rustdoc: fix bugs in main.js popover help and settings)
 - rust-lang#98647 (Update cargo)
 - rust-lang#98652 (`alloc`: clean and ensure `no_global_oom_handling`  builds are warning-free)
 - rust-lang#98660 (Unbreak stage1 tests via ignore-stage1 in `proc-macro/invalid-punct-ident-1.rs`.)
 - rust-lang#98665 (Use verbose help for deprecation suggestion)
 - rust-lang#98668 (Avoid some `&str` to `String` conversions with `MultiSpan::push_span_label`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 05c0b2e into rust-lang:master Jun 29, 2022
@rustbot rustbot added this to the 1.64.0 milestone Jun 29, 2022
@yanchen4791 yanchen4791 deleted the issue-98260-fix branch July 1, 2022 15:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@spastorino spastorino

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.64.0
Development

Successfully merging this pull request may close these issues.

Cycle detected error instead of invalid function signature on trait
8 participants
@yanchen4791 @rust-highfive @compiler-errors @spastorino @bors @jackh726 @petrochenkov @rustbot