Skip to content

merge need_type_info_err(_const) - #77093

Merged
bors merged 8 commits into
rust-lang:masterfrom
lcnr:const-generics-infer-warning
Sep 26, 2020
Merged

merge need_type_info_err(_const)#77093
bors merged 8 commits into
rust-lang:masterfrom
lcnr:const-generics-infer-warning

Conversation

@lcnr

@lcnrlcnr commented Sep 23, 2020•
edited
Loading

Copy link
Copy Markdown
Contributor

I hoped that this would automatically solve #76737 but it doesn't quite seem like it

fixes#77092

r? @varkor

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 23, 2020
varkor
varkor reviewed Sep 23, 2020
View reviewed changes

@varkorvarkor left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've just skimmed the implementation for now: I'll take a closer look later. But I'm really happy to see this code cleaned up!

Comment threadcompiler/rustc_infer/src/infer/error_reporting/need_type_info.rs Outdated
Comment threadcompiler/rustc_infer/src/infer/error_reporting/need_type_info.rs Outdated
Comment threadcompiler/rustc_infer/src/infer/error_reporting/need_type_info.rs Outdated
Comment threadsrc/test/ui/const-generics/infer/issue-77092.stderr
--> $DIR/issue-77092.rs:13:26
|
LL | println!("{:?}", take_array_from_mut(&mut arr, i));
| ^^^^^^^^^^^^^^^^^^^ cannot infer the value of the constant `{_: usize}`

@varkorvarkorSep 23, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it make more sense here to use a similar message to below?
E.g.

cannot infer the value of const parameter `N`

@lcnrlcnrSep 23, 2020

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the failed inference variable has a ConstInference origin, as it was created from unifying two uninferred consts vids.

So we don't have the info to emit a better error message in this case. We probably should "just" use one of the ConstParams as the origin in that case. I think the reason we don't do so with types is due to variance.

Not completely sure about all of this though, so I would prefer to look into this in a followup PR

@lcnr

lcnr commented Sep 24, 2020

Copy link
Copy Markdown
ContributorAuthor

Implement the name changes and put the result of previously extract_type_name into a new struct.

I am myself not completely happy with the new names but wasn't able to think of anything better 😆

varkor
varkor reviewed Sep 25, 2020
View reviewed changes

@varkorvarkor left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actual implementation looks good, so r=me after renaming ty and if you're happy with the names.

Comment threadcompiler/rustc_infer/src/infer/error_reporting/need_type_info.rs Outdated
Comment threadcompiler/rustc_infer/src/infer/error_reporting/need_type_info.rs Outdated
Comment threadcompiler/rustc_infer/src/infer/error_reporting/need_type_info.rs Outdated
Comment threadcompiler/rustc_infer/src/infer/error_reporting/need_type_info.rs Outdated
@lcnr

lcnr commented Sep 26, 2020

Copy link
Copy Markdown
ContributorAuthor

@bors r=varkor rollup

@bors

bors commented Sep 26, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 9a607c0 has been approved by varkor

@borsbors 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 Sep 26, 2020
RalfJung added a commit to RalfJung/rust that referenced this pull request Sep 26, 2020
@RalfJung
Rollup merge ofrust-lang#77093- lcnr:const-generics-infer-warning, …
04c4696
…r=varkor
merge `need_type_info_err(_const)`
I hoped that this would automatically solve rust-lang#76737 but it doesn't quite seem like it
fixesrust-lang#77092
r? @varkor
@RalfJungRalfJung mentioned this pull request Sep 26, 2020
Closed
@RalfJungRalfJung mentioned this pull request Sep 26, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 26, 2020
@bors
Auto merge ofrust-lang#77224- RalfJung:rollup-hdvb96c, r=RalfJung
e37c99f
Rollup of 12 pull requests
Successful merges:
- rust-lang#75454 (Explicitly document the size guarantees that Option makes.)
- rust-lang#76631 (Add `x.py setup`)
- rust-lang#77076 (Add missing code examples on slice iter types)
- rust-lang#77093 (merge `need_type_info_err(_const)`)
- rust-lang#77122 (Add `#![feature(const_fn_floating_point_arithmetic)]`)
- rust-lang#77127 (Update mdBook)
- rust-lang#77161 (Remove TrustedLen requirement from BuilderMethods::switch)
- rust-lang#77166 (update Miri)
- rust-lang#77181 (Add doc alias for pointer primitive)
- rust-lang#77204 (Remove stray word from `ClosureKind::extends` docs)
- rust-lang#77207 (Rename `whence` to `span`)
- rust-lang#77211 (Remove unused #[allow(...)] statements from compiler/)
Failed merges:
- rust-lang#77170 (Remove `#[rustc_allow_const_fn_ptr]` and add `#![feature(const_fn_fn_ptr_basics)]`)
r? `@ghost`
@bors
bors merged commit ac8169d into rust-lang:masterSep 26, 2020
@rustbotrustbot added this to the 1.48.0 milestone Sep 26, 2020
@lcnr
lcnr deleted the const-generics-infer-warning branch September 27, 2020 08:25
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@varkorvarkorvarkor left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@varkorvarkor

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

1.48.0

Development

Successfully merging this pull request may close these issues.

Malformed error message with wrong use of min const generics

5 participants

@lcnr@bors@varkor@rust-highfive@rustbot