Alex Crichton
06ce77cb39
Merge remote-tracking branch 'origin/master' into gen
2017-07-28 13:07:15 -07:00
bors
eba9d7f08c
Auto merge of #43298 - gaurikholkar:lifetime_errors, r=estebank
...
improve case with both anonymous lifetime parameters #43269
This is a fix to #43269 .
Sample output message-
```
error[E0623]: lifetime mismatch
--> $DIR/ex3-both-anon-regions.rs:12:12
|
11 | fn foo(x: &mut Vec<&u8>, y: &u8) {
| --- --- these references must have the same lifetime
12 | x.push(y);
| ^ data from `y` flows into `x` here
error: aborting due to 2 previous errors
```
r? @nikomatsakis
2017-07-28 16:03:32 +00:00
John Kåre Alsaker
416096d0fd
Update comment
2017-07-28 15:47:55 +02:00
Alex Crichton
ff996853fe
Fix more tests with GeneratorState rename
2017-07-28 15:47:55 +02:00
John Kåre Alsaker
be0a9b8958
Fix tests
2017-07-28 15:47:55 +02:00
John Kåre Alsaker
ae1856cb9e
Update rename State in docs
2017-07-28 15:47:55 +02:00
John Kåre Alsaker
93b9b1a2b1
Fix tests
2017-07-28 15:47:55 +02:00
John Kåre Alsaker
9556faca68
Fix error message string
2017-07-28 15:47:55 +02:00
John Kåre Alsaker
0f8897cc35
Fix error code
2017-07-28 15:47:55 +02:00
John Kåre Alsaker
9a6a8668ae
Remove visit_body from YieldFinder
2017-07-28 15:47:14 +02:00
John Kåre Alsaker
5da9a8aa19
Rename some variables in lowering.rs and add an error number for the error
2017-07-28 15:47:14 +02:00
John Kåre Alsaker
df0496a620
Rename State to GeneratorState
2017-07-28 15:46:27 +02:00
John Kåre Alsaker
62e210fb3c
Derive traits for State.
2017-07-28 15:46:27 +02:00
Niko Matsakis
39478e8ab1
update references due to removing tabs
2017-07-28 15:46:27 +02:00
John Kåre Alsaker
d32428bc5f
Remove tabs
2017-07-28 15:46:27 +02:00
John Kåre Alsaker
b2d931abbb
Fix error message tests again
2017-07-28 15:46:27 +02:00
John Kåre Alsaker
6106f6c5c1
Fix error message tests
2017-07-28 15:46:27 +02:00
John Kåre Alsaker
0a8b81a568
Ignore drop check bools when testing for legal generator types
2017-07-28 15:46:27 +02:00
John Kåre Alsaker
4628f8534f
Fix error message tests
2017-07-28 15:46:27 +02:00
John Kåre Alsaker
f5ec50358a
Fix tidy errors
2017-07-28 15:46:27 +02:00
Niko Matsakis
3fdc3fa1ec
change how we report err_out_of_scope borrowck errors
...
Also, remove the explicit code detecting borrows over a yield. It
turns out not to be necessary -- any such borrow winds up with a
lifetime that is part of the generator type, and therefore which will
outlive the generator expression itself, which yields an
`err_out_of_scope`. So instead we intercept those errors and display
them in a nicer way.
2017-07-28 15:46:27 +02:00
Niko Matsakis
188cdf499f
combine bckerr_to_diag and note_and_explain_bckerr
2017-07-28 15:46:27 +02:00
John Kåre Alsaker
5a6e0694da
Remove a FIXME and apply the same hack as closures
2017-07-28 15:46:27 +02:00
John Kåre Alsaker
14c747678e
Fix a string literal
2017-07-28 15:46:27 +02:00
John Kåre Alsaker
e4fdbcbc9f
Update FIXME
2017-07-28 15:46:26 +02:00
John Kåre Alsaker
b744b1cfe3
Convert to spaces
2017-07-28 15:46:26 +02:00
John Kåre Alsaker
cbdb18650e
Add some comments
2017-07-28 15:46:26 +02:00
John Kåre Alsaker
eea290d7fd
Convert to spaces
2017-07-28 15:46:26 +02:00
Alex Crichton
09a5d319ab
Remove support for gen arg
2017-07-28 15:46:26 +02:00
John Kåre Alsaker
93172045c8
Fix a bug with yielding subtypes of the yield type.
2017-07-28 15:46:25 +02:00
John Kåre Alsaker
dcddd80729
Remove debug code
2017-07-28 15:46:25 +02:00
John Kåre Alsaker
a602fc06bd
Revert some whitespace changes
2017-07-28 15:46:25 +02:00
John Kåre Alsaker
10def9a6e0
Revert borrowck changes
2017-07-28 15:46:25 +02:00
John Kåre Alsaker
2ad0f89e86
Tweak docs
2017-07-28 15:46:25 +02:00
Niko Matsakis
d71fa9371c
fix yields-in-args test and add a reverse one
2017-07-28 15:46:25 +02:00
Niko Matsakis
264c3f4952
add some tests of yielding with outstanding borrows
...
No doubt there are more tests one might write, but it's a start.
2017-07-28 15:46:25 +02:00
Alex Crichton
8e82b19c6b
Convert tabs to spaces
2017-07-28 15:46:25 +02:00
Alex Crichton
12bbcd3c29
Add a test case for conditional drop
2017-07-28 15:46:25 +02:00
John Kåre Alsaker
77bf6e4461
Add a test
2017-07-28 15:46:25 +02:00
Alex Crichton
7eae8489fc
Touch up unstable docs for generators
2017-07-28 15:46:25 +02:00
John Kåre Alsaker
6e66dccc44
Remove a FIXME
2017-07-28 15:46:24 +02:00
John Kåre Alsaker
05fcef0b3e
Fix printing
2017-07-28 15:46:24 +02:00
John Kåre Alsaker
21f2d259e0
Consider StorageDead and StorageLive as gens for liveness analysis
2017-07-28 15:46:24 +02:00
John Kåre Alsaker
75eb59895f
Copy a comment
2017-07-28 15:46:24 +02:00
John Kåre Alsaker
098d6f0597
Move a FIXME around
2017-07-28 15:46:24 +02:00
John Kåre Alsaker
66b8a12a6d
Fix upstream changes
2017-07-28 15:46:24 +02:00
John Kåre Alsaker
bfd71c5b70
Fix examples
2017-07-28 15:46:24 +02:00
John Kåre Alsaker
8bcafc5e17
Fix hash impl for SimplifiedType
2017-07-28 15:46:24 +02:00
Alex Crichton
5d174f0035
Clarifying documentation for generator
2017-07-28 15:46:24 +02:00
John Kåre Alsaker
e62d9d5230
Fix tests
2017-07-28 15:46:24 +02:00
