Extend E0623 for fn items #44516

gaurikholkar-zz · 2017-09-12T04:45:30Z

This fixes #44516
The below example now gives

error[E0623]: lifetime mismatch
 --> gg.rs:3:10
  |
2 | fn foo(x:fn(&u8, &u8), y: Vec<&u8>, z: &u8) {
  |                               ---      --- these two types are declared with different lifetimes...
3 |   y.push(z);
  |          ^ ...but data from `z` flows into `y` here

error: aborting due to previous error

r? @nikomatsakis
cc @arielb1

kennytm · 2017-09-12T09:10:34Z

src/librustc/infer/error_reporting/different_lifetimes.rs

+                self.depth -= 1;
+                return;
+            }
+


Trailing whitespace

[00:04:19] tidy error: /checkout/src/librustc/infer/error_reporting/different_lifetimes.rs:213: trailing whitespace

BTW you could run the tidy test locally using

./x.py test src/tools/tidy

You also need to handle TyTraitObject (aka the Fn in Box<Fn<(&u8, &u8)>>).

yeah at it :)

@arielb1 need an example to test

kennytm · 2017-09-12T09:11:36Z

src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.rs

    y.b = x;
+=======
+    x = y.b;
+>>>>>>> Adding E0623 for structs


ERROR: merge conflict marker in file

kennytm · 2017-09-12T11:54:38Z

src/librustc/infer/error_reporting/different_lifetimes.rs

+            hir::TyBareFn(_) => {
+                self.depth += 1;
+                intravisit::walk_ty(self, arg);
+                self.depth -= 1;


No such field depth. Do you mean the depth of the de Bruijn index or something?

[00:06:31] error[E0609]: no field `depth` on type `&mut infer::error_reporting::different_lifetimes::FindNestedTypeVisitor<'a, 'gcx, 'tcx>` [00:06:31] --> /checkout/src/librustc/infer/error_reporting/different_lifetimes.rs:208:22 [00:06:31] | [00:06:31] 208 | self.depth += 1; [00:06:31] | ^^^^^ [00:06:31] [00:06:31] error[E0609]: no field `depth` on type `&mut infer::error_reporting::different_lifetimes::FindNestedTypeVisitor<'a, 'gcx, 'tcx>` [00:06:31] --> /checkout/src/librustc/infer/error_reporting/different_lifetimes.rs:210:22 [00:06:31] | [00:06:31] 210 | self.depth -= 1; [00:06:31] | ^^^^^ [00:06:31] [00:06:41] error: aborting due to 2 previous errors [00:06:41] [00:06:41] error: Could not compile `rustc`.

kennytm · 2017-09-12T15:03:35Z

src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.stderr

+15 | fn foo(mut x: Ref) {
+   |               ---
+   |               |
+   |               these two types are declared with different lifetimes...


Test case differs from actual output.

error[E0623]: lifetime mismatch --> $DIR/ex3-both-anon-regions-both-are-structs-4.rs:16:11 | 15 | fn foo(mut x: Ref) { | --- | | - | these two types are declared with different lifetimes... + | this type was declared with multiple lifetimes... 16 | x.a = x.b; | ^^^ ...but data with one lifetime flows into the other here

kennytm · 2017-09-12T15:04:35Z

src/test/ui/lifetime-errors/ex3-both-anon-regions-using-fn-items.stderr

@@ -0,0 +1,10 @@
+error[E0623]: lifetime mismatch
+  --> src/test/ui/lifetime-errors/ex3-both-anon-regions-using-fn-items.rs:11:10


Ditto

error[E0623]: lifetime mismatch - --> src/test/ui/lifetime-errors/ex3-both-anon-regions-using-fn-items.rs:11:10 + --> $DIR/ex3-both-anon-regions-using-fn-items.rs:11:10 | 10 | fn foo(x:fn(&u8, &u8), y: Vec<&u8>, z: &u8) { | --- --- these two types are declared with different lifetimes... 11 | y.push(z); | ^ ...but data from `z` flows into `y` here error: aborting due to previous error

arielb1 · 2017-09-13T19:10:21Z

@bors r+

bors · 2017-09-13T19:10:22Z

📌 Commit e71eef1 has been approved by arielb1

arielb1 · 2017-09-13T19:48:46Z

I think this doesn't handle the case of structs

struct Ref<'a>(&'a ());
fn foo(x:fn(Ref, Ref), y: Vec<&u8>, z: &u8) {
  y.push(z);
}

arielb1 · 2017-09-13T19:52:28Z

@bors p=1

This is blocking further work

gaurikholkar-zz · 2017-09-13T20:02:57Z

@arielb1 it does though

error[E0623]: lifetime mismatch
 --> kk.rs:4:10
  |
3 | fn foo(x:fn(Ref, Ref), y: Vec<&u8>, z: &u8) {
  |             ---  --- these two types are declared with different lifetimes...
4 |   y.push(z);
  |          ^ ...but data from `z` flows into `y` here

error: aborting due to previous error

@nikomatsakis

Extend E0623 for fn items This fixes #44516 The below example now gives ``` error[E0623]: lifetime mismatch --> gg.rs:3:10 | 2 | fn foo(x:fn(&u8, &u8), y: Vec<&u8>, z: &u8) { | --- --- these two types are declared with different lifetimes... 3 | y.push(z); | ^ ...but data from `z` flows into `y` here error: aborting due to previous error ``` r? @nikomatsakis cc @arielb1

bors · 2017-09-13T21:20:27Z

⌛ Testing commit e71eef1 with merge 9421141...

bors · 2017-09-14T00:21:44Z

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

bjorn3 · 2017-09-14T11:28:52Z

fn.rs

@@ -0,0 +1,8 @@
+
+fn foo(x:  fn(&u8, &u8), y: Vec<&u8>, z: &u8) {


Did you accidentially left this file in the root dir?

Oh yeah. I'm open a PR for that or I have an ongoing PR, I'll make sure to delete that.

Fixed in #44549. Thanks!

gaurikholkar added 5 commits September 12, 2017 10:06

Adding E0623 for structs

2f50c33

extend E0623 for fns

ed11812

add logs

b2d869d

correct depth initialisation

54af570

fixes

a128051

rust-highfive assigned nikomatsakis Sep 12, 2017

kennytm requested changes Sep 12, 2017

View reviewed changes

arielb1 assigned arielb1 and unassigned nikomatsakis Sep 12, 2017

arielb1 added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Sep 12, 2017

add ui test for fn items, tidy fixes

93529b4

kennytm requested changes Sep 12, 2017

View reviewed changes

Adding changes for trait objects

6e3cdce

kennytm requested changes Sep 12, 2017

View reviewed changes

fix ui tests

e71eef1

nikomatsakis mentioned this pull request Sep 13, 2017

extend E0623 for earlybound and latebound for structs #44549

Merged

bors merged commit e71eef1 into rust-lang:master Sep 14, 2017

bors mentioned this pull request Sep 14, 2017

incr.comp.: Compute fingerprint for all query results. #44364

Merged

This was referenced Sep 14, 2017

E0623 gives wrong error message for following example with fn items #43937

Closed

improve case with both anonymous lifetime parameters in functions and trait objects. #43276

Closed

bjorn3 reviewed Sep 14, 2017

View reviewed changes

gaurikholkar-zz mentioned this pull request Sep 29, 2017

Extend E0623 for fn and trait objects WIP #43877

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Extend E0623 for fn items #44516

Extend E0623 for fn items #44516

gaurikholkar-zz commented Sep 12, 2017 •

edited

Loading

kennytm Sep 12, 2017

arielb1 Sep 12, 2017

gaurikholkar-zz Sep 12, 2017

gaurikholkar-zz Sep 12, 2017

kennytm Sep 12, 2017

arielb1 Sep 12, 2017

kennytm Sep 12, 2017

kennytm Sep 12, 2017

kennytm Sep 12, 2017

arielb1 commented Sep 13, 2017

bors commented Sep 13, 2017

arielb1 commented Sep 13, 2017

arielb1 commented Sep 13, 2017

gaurikholkar-zz commented Sep 13, 2017 •

edited

Loading

bors commented Sep 13, 2017

bors commented Sep 14, 2017

bjorn3 Sep 14, 2017

gaurikholkar-zz Sep 14, 2017

gaurikholkar-zz Sep 14, 2017

		@@ -0,0 +1,10 @@
		error[E0623]: lifetime mismatch
		--> src/test/ui/lifetime-errors/ex3-both-anon-regions-using-fn-items.rs:11:10

		@@ -0,0 +1,8 @@

		fn foo(x: fn(&u8, &u8), y: Vec<&u8>, z: &u8) {

Extend E0623 for fn items #44516

Extend E0623 for fn items #44516

Conversation

gaurikholkar-zz commented Sep 12, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

arielb1 commented Sep 13, 2017

bors commented Sep 13, 2017

arielb1 commented Sep 13, 2017

arielb1 commented Sep 13, 2017

gaurikholkar-zz commented Sep 13, 2017 • edited Loading

bors commented Sep 13, 2017

bors commented Sep 14, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gaurikholkar-zz commented Sep 12, 2017 •

edited

Loading

gaurikholkar-zz commented Sep 13, 2017 •

edited

Loading