Account for bad placeholder types in where clauses #70294

estebank · 2020-03-23T01:52:05Z

Fix #70291. Follow up to #69148.

rust-highfive · 2020-03-23T01:52:09Z

r? @ecstatic-morse

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

src/librustc_typeck/collect.rs

src/librustc_typeck/astconv.rs

src/test/ui/did_you_mean/bad-assoc-ty.stderr

estebank · 2020-03-23T03:14:41Z

r? @Centril

src/librustc_typeck/astconv.rs

Centril · 2020-03-23T06:32:44Z

@bors try @rust-timer queue

rust-timer · 2020-03-23T06:32:45Z

Awaiting bors try build completion

bors · 2020-03-23T06:32:55Z

⌛ Trying commit 7c8fe98681ac93740c1c959f0b4951ad090034ee with merge 50962f2a2876523fc8f966266bee06123a5dcd3b...

bors · 2020-03-23T09:18:33Z

☀️ Try build successful - checks-azure
Build commit: 50962f2a2876523fc8f966266bee06123a5dcd3b (50962f2a2876523fc8f966266bee06123a5dcd3b)

rust-timer · 2020-03-23T09:18:35Z

Queued 50962f2a2876523fc8f966266bee06123a5dcd3b with parent 37c945d, future comparison URL.

rust-timer · 2020-03-23T18:23:54Z

Finished benchmarking try commit 50962f2a2876523fc8f966266bee06123a5dcd3b, comparison URL.

estebank · 2020-03-23T18:45:32Z

This as it stands doesn't handle fn foo<F: Fn() -> _>(_: F) {}. I'll fix that.

Centril · 2020-03-23T19:02:15Z

@estebank does it ICE in that case? If not, then let's not fix it in this PR.

estebank · 2020-03-23T19:12:44Z

It does ICE. Changing this to use walk_generics(&mut visitor, generics); makes the ICE go away at the cost of a duplicated error. I'll see if I can get rid of the dupe, but if not I prefer that over an ICE.

Centril · 2020-03-23T19:30:25Z

@estebank Could we do the simple thing in this PR for backportability reasons and follow up with possible de-dup improvements?

estebank · 2020-03-23T19:36:14Z

I'm comfortable with the current state of the PR.

estebank · 2020-03-23T19:36:55Z

src/librustc_typeck/astconv.rs

-        if !inferred_params.is_empty() {
-            // We always collect the spans for placeholder types when evaluating `fn`s, but we
-            // only want to emit an error complaining about them if infer types (`_`) are not
-            // allowed. `allow_ty_infer` gates this behavior.
-            crate::collect::placeholder_type_error(
-                tcx,
-                inferred_params[0],
-                &[],
-                inferred_params,
-                false,
-            );
-        }


Removing this got rid of the duplicated errors.

Centril · 2020-03-23T19:42:19Z

I am too, let's

@bors r+

bors · 2020-03-23T19:42:20Z

📌 Commit b8bca241cb7f372170bdc628ef2cdbc19f7d3f14 has been approved by Centril

estebank · 2020-03-23T19:56:26Z

rustfmt an import 🤦‍♂️

@bors r=Centril

bors · 2020-03-23T19:56:27Z

📌 Commit e75158d has been approved by Centril

…r=Centril Account for bad placeholder types in where clauses Fix rust-lang#70291. Follow up to rust-lang#69148.

@ghost

Rollup of 11 pull requests Successful merges: - rust-lang#67761 (Move the dep_graph construction to a dedicated crate.) - rust-lang#69740 (Replace some desc logic in librustc_lint with article_and_desc) - rust-lang#69981 (Evaluate repeat expression lengths as late as possible) - rust-lang#70087 (Remove const eval loop detector) - rust-lang#70242 (Improve E0308 error message wording) - rust-lang#70264 (Fix invalid suggestion on `&mut` iterators yielding `&` references) - rust-lang#70267 (get rid of ConstPropUnsupported; use ZST marker structs instead) - rust-lang#70277 (Remove `ReClosureBound`) - rust-lang#70283 (Add regression test for rust-lang#70155.) - rust-lang#70294 (Account for bad placeholder types in where clauses) - rust-lang#70309 (Clean up E0452 explanation) Failed merges: r? @ghost

@Centril

…r=Centril Fix smaller issues with invalid placeholder type errors Follow up to rust-lang#70294. - Fix placement of suggested generic param when bounds are present. - Reduce error duplication for invalid placeholder types in `fn` types. r? @Centril

@Centril

…r=Centril Fix smaller issues with invalid placeholder type errors Follow up to rust-lang#70294. - Fix placement of suggested generic param when bounds are present. - Reduce error duplication for invalid placeholder types in `fn` types. r? @Centril

pnkfelix · 2020-04-01T19:17:31Z

Discussed in T-compiler meeting. Accepted for beta-backport.

…ulacrum [beta] backport 4 PRs This backports the following PRs: * parse_and_disallow_postfix_after_cast: account for `ExprKind::Err`. rust-lang#70556 * Account for bad placeholder types in where clauses rust-lang#70294 * Fix "since" field for `Once::is_complete`'s `#[stable]` attribute rust-lang#70018 * Ensure HAS_FREE_LOCAL_NAMES is set for ReFree rust-lang#69956 All commits cherry picked cleanly.

rust-highfive assigned ecstatic-morse Mar 23, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 23, 2020

Centril reviewed Mar 23, 2020

View reviewed changes

src/librustc_typeck/collect.rs Outdated Show resolved Hide resolved

src/librustc_typeck/astconv.rs Outdated Show resolved Hide resolved

estebank commented Mar 23, 2020

View reviewed changes

src/test/ui/did_you_mean/bad-assoc-ty.stderr Outdated Show resolved Hide resolved

rust-highfive assigned Centril and unassigned ecstatic-morse Mar 23, 2020

estebank force-pushed the bad-placeholder-in-where branch from 0410eee to 5af9042 Compare March 23, 2020 03:29

Centril reviewed Mar 23, 2020

View reviewed changes

src/librustc_typeck/astconv.rs Outdated Show resolved Hide resolved

estebank force-pushed the bad-placeholder-in-where branch from 5af9042 to 7c8fe98 Compare March 23, 2020 06:18

Centril added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 23, 2020

estebank force-pushed the bad-placeholder-in-where branch from 7c8fe98 to b8bca24 Compare March 23, 2020 19:35

estebank commented Mar 23, 2020

View reviewed changes

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 Mar 23, 2020

Account for bad placeholder types in where clauses

e75158d

estebank force-pushed the bad-placeholder-in-where branch from b8bca24 to e75158d Compare March 23, 2020 19:55

Centril added a commit to Centril/rust that referenced this pull request Mar 23, 2020

Rollup merge of rust-lang#70294 - estebank:bad-placeholder-in-where, …

de1b094

…r=Centril Account for bad placeholder types in where clauses Fix rust-lang#70291. Follow up to rust-lang#69148.

Centril mentioned this pull request Mar 23, 2020

Rollup of 9 pull requests #70335

Closed

Centril added a commit to Centril/rust that referenced this pull request Mar 23, 2020

Rollup merge of rust-lang#70294 - estebank:bad-placeholder-in-where, …

b07333c

…r=Centril Account for bad placeholder types in where clauses Fix rust-lang#70291. Follow up to rust-lang#69148.

This was referenced Mar 23, 2020

Rollup of 9 pull requests #70338

Closed

Rollup of 11 pull requests #70343

Merged

bors merged commit 54db0cf into rust-lang:master Mar 24, 2020

estebank mentioned this pull request Mar 24, 2020

Fix smaller issues with invalid placeholder type errors #70369

Merged

pnkfelix added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Apr 1, 2020

Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 3, 2020

Mark-Simulacrum mentioned this pull request Apr 3, 2020

[beta] backport 4 PRs #70742

Merged

estebank mentioned this pull request Oct 3, 2020

Fix bad placeholder type error on certain consts and statics #77431

Closed

Account for bad placeholder types in where clauses #70294

Account for bad placeholder types in where clauses #70294

Uh oh!

Conversation

estebank commented Mar 23, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-highfive commented Mar 23, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

estebank commented Mar 23, 2020

Uh oh!

Uh oh!

Centril commented Mar 23, 2020

Uh oh!

rust-timer commented Mar 23, 2020

Uh oh!

bors commented Mar 23, 2020

Uh oh!

bors commented Mar 23, 2020

Uh oh!

rust-timer commented Mar 23, 2020

Uh oh!

rust-timer commented Mar 23, 2020

Uh oh!

estebank commented Mar 23, 2020

Uh oh!

Centril commented Mar 23, 2020

Uh oh!

estebank commented Mar 23, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Centril commented Mar 23, 2020

Uh oh!

estebank commented Mar 23, 2020

Uh oh!

estebank Mar 23, 2020

Choose a reason for hiding this comment

Uh oh!

Centril commented Mar 23, 2020

Uh oh!

bors commented Mar 23, 2020

Uh oh!

estebank commented Mar 23, 2020

Uh oh!

bors commented Mar 23, 2020

Uh oh!

pnkfelix commented Apr 1, 2020

Uh oh!

Uh oh!

estebank commented Mar 23, 2020 •

edited

Loading

estebank commented Mar 23, 2020 •

edited

Loading