Jonathan Turner
ab734210f0
Rollup merge of #35360 - medzin:E0388, r=jonathandturner
...
Updated error message E0388
Fixes #35339 as part of #35233 .
r? @GuillaumeGomez
2016-08-22 15:34:18 -07:00
Adam Medziński
bfbdff0e2d
Updated error message E0388
2016-08-22 23:22:40 +02:00
bors
42584d36f6
Auto merge of #35777 - nrc:carrier3, r=@nikomatsakis
...
Carrier trait (third attempt)
This adds a `Carrier` trait to operate with `?`. The only public implementation is for `Result`, so effectively the trait does not exist, however, it ensures future compatibility for the `?` operator. This is not intended to be used, nor is it intended to be a long-term solution.
Although this exact PR has not been through Crater, I do not expect it to be a breaking change based on putting numerous similar PRs though Crater in the past.
cc:
* [? tracking issue](https://github.com/rust-lang/rust/issues/31436 )
* [previous PR](https://github.com/rust-lang/rust/pull/35056 )
* [RFC issue](https://github.com/rust-lang/rfcs/issues/1718 ) for discussion of long-term Carrier trait solutions.
r? @nikomatsakis
2016-08-21 15:12:43 -07:00
bors
1576de0ce6
Auto merge of #35776 - jseyfried:more_groundwork, r=nrc
...
resolve: More groundwork for `item_like_imports` (RFC 1560)
r? @nrc
2016-08-21 11:03:48 -07:00
Jonathan Turner
9072861c20
Rollup merge of #35839 - jonathandturner:error_touchup, r=Aatch
...
Wording fixes in error messages
This PR is largely wording fixes to existing PRs that I found going back through the ones that have already been updated. Sometimes seeing the message in context made me think "oh there's a better wording!"
There's one additional fix. This will also prevent the secondary underlining of derive call (since they look like macros to the system in the way I was using):
```
error[E0184]: the trait `Copy` may not be implemented for this type; the type has a destructor
--> src/test/compile-fail/E0184.rs:11:10
|
11 | #[derive(Copy)] //~ ERROR E0184
| ^^^^
| |
| in this macro invocation
```
Is now just:
```
error[E0184]: the trait `Copy` may not be implemented for this type; the type has a destructor
--> src/test/compile-fail/E0184.rs:11:10
|
11 | #[derive(Copy)] //~ ERROR E0184
| ^^^^
```
2016-08-20 07:09:37 -07:00
Jonathan Turner
b22352f568
Rollup merge of #35831 - trixnz:error-428, r=jonathandturner
...
Update E0428 to new format
Fixes #35798 as part of #35233 .
r? @jonathandturner
2016-08-20 07:09:37 -07:00
Jonathan Turner
f17ff3aa93
Rollup merge of #35818 - wdv4758h:E0133-label, r=Aatch
...
Fix label messages for E0133
Issue #35789
2016-08-20 07:09:36 -07:00
Jonathan Turner
b9c0a8cd8e
Rollup merge of #35812 - mlayne:E0232, r=jonathandturner
...
Update error format for E0232
Fixes #35795 , as part of #35233 .
Excited to make my first contribution to rustc!
r? @jonathandturner
2016-08-20 07:09:36 -07:00
Jonathan Turner
15277eb0a9
Rollup merge of #35804 - pliniker:master, r=jonathandturner
...
Update error message for E0084
Fixes #35792 as part of #35233
r? @jonathandturner
2016-08-20 07:09:35 -07:00
Jonathan Turner
69612f0039
Rollup merge of #35780 - clementmiao:E0396_new_err_format, r=jonathandturner
...
updated E0396 to new error format
Updated E0396 to new error format.
Part of #35233
Fixes #35779
Thanks again for letting me help!
r? @jonathandturner
2016-08-20 07:09:35 -07:00
Jonathan Turner
7c843c4663
Rollup merge of #35778 - clementmiao:E0395_new_error_format, r=jonathandturner
...
updated E0395 to new error format
Updated E0395 to new error format.
Part of #35233
Fixes #35693
Thanks again for letting me help!
r? @jonathandturner
2016-08-20 07:09:34 -07:00
trixnz
d791aa1b3f
Fix broken tests for E0428
2016-08-20 12:10:41 +02:00
Jonathan Turner
54d0acd2fc
wording fixes in error messages
2016-08-19 16:05:37 -07:00
trixnz
3b64cf669c
Update E0428 to new format
2016-08-19 19:19:34 +02:00
Chiu-Hsiang Hsu
2128d31a41
Fix label messages for E0133
...
Issue #35789
2016-08-19 11:58:26 +08:00
Nick Cameron
5aa89d8bf6
Remove the Option and bool impls for carrier and add a dummy impl
...
The dummy impl should ensure the same type checking behaviour as having other (real) Carrier impls.
2016-08-19 13:31:55 +12:00
Michael Layne
39f318bb4d
Update error format for E0232
2016-08-18 15:31:34 -07:00
pliniker
161cb36159
Update error message for E0084
2016-08-18 16:27:33 -04:00
bors
43c090ed69
Auto merge of #35732 - jonathandturner:region_error_labels, r=nikomatsakis
...
Move 'doesn't live long enough' errors to labels
This patch moves the "doesn't live long enough" region-style errors to instead use labels.
An example follows.
Before:
```
error: `x` does not live long enough
--> src/test/compile-fail/send-is-not-static-ensures-scoping.rs:26:18
|
26 | let y = &x;
| ^
|
note: reference must be valid for the block at 23:10...
--> src/test/compile-fail/send-is-not-static-ensures-scoping.rs:23:11
|
23 | fn main() {
| ^
note: ...but borrowed value is only valid for the block suffix following statement 0 at 25:18
--> src/test/compile-fail/send-is-not-static-ensures-scoping.rs:25:19
|
25 | let x = 1;
| ^
```
After:
```
error: `x` does not live long enough
--> src/test/compile-fail/send-is-not-static-ensures-scoping.rs:26:18
|
26 | let y = &x;
| ^ does not live long enough
...
32 | };
| - borrowed value only valid until here
...
35 | }
| - borrowed value must be valid until here
```
r? @nikomatsakis
2016-08-18 05:39:11 -07:00
Jeffrey Seyfried
951d3d6872
Fix fallout in tests.
2016-08-18 08:09:24 +00:00
bors
9d6520f97b
Auto merge of #35769 - eddyb:rollup, r=eddyb
...
Rollup of 12 pull requests
- Successful merges: #35346 , #35734 , #35739 , #35740 , #35742 , #35744 , #35749 , #35750 , #35751 , #35756 , #35766 , #35768
- Failed merges:
2016-08-18 00:15:11 -07:00
clementmiao
dae1406b82
updated E0396 to new error format
2016-08-17 22:45:21 -07:00
clementmiao
0dc13ee7f2
updated E0395 to new error format
2016-08-17 22:03:52 -07:00
Eduard-Mihai Burtescu
d69cd7207b
Rollup merge of #35770 - crypto-universe:E0221, r=jonathandturner
...
Updated test for E0221
As a part of issue #35233
?r @GuillaumeGomez
2016-08-18 06:12:23 +03:00
Eduard-Mihai Burtescu
d36b296cb6
Rollup merge of #35768 - GuillaumeGomez:err_codes, r=jonathandturner
...
Add new error code tests
r? @jonathandturner
2016-08-18 06:12:23 +03:00
Eduard-Mihai Burtescu
8ccc11b31b
Rollup merge of #35765 - KiChjang:e0053-bonus, r=jonathandturner
...
Additional span info for E0053
Part of #35233 .
Fixes #35212 .
r? @jonathandturner
2016-08-18 06:12:23 +03:00
Eduard-Mihai Burtescu
c3601d40ec
Rollup merge of #35756 - crypto-universe:E0407, r=GuillaumeGomez
...
New output for E0407
Issue #35697 as a part of #35233 .
r? @GuillaumeGomez
2016-08-18 06:12:23 +03:00
Eduard-Mihai Burtescu
f1861b814a
Rollup merge of #35749 - GuillaumeGomez:raw_field, r=jonathandturner
...
Fixes issue #11004
Fixes #11004 .
r? @jonathandturner
2016-08-18 06:12:22 +03:00
Eduard-Mihai Burtescu
394c4497de
Rollup merge of #35744 - DevShep:ds/update_E0009, r=jonathandturner
...
Update E0009 to new format
Part of #35233
Fixes #35193
r? @jonathandturner
2016-08-18 06:12:22 +03:00
Eduard-Mihai Burtescu
71759ec52c
Rollup merge of #35739 - circuitfox:E0403-update-error-format, r=jonathandturner
...
E0403 update error format
Fixes #35696
Part of #35233
r? @jonathandturner
Also did the bonus for this one.
2016-08-18 06:12:21 +03:00
Eduard-Mihai Burtescu
612506bfff
Rollup merge of #35346 - DarkEld3r:e0093-formatting, r=jonathandturner
...
Update compiler error 0093 to use new error format
Addresses #35230 , Part of the #35233 meta bug
r? @jonathandturner
2016-08-18 06:12:21 +03:00
Jonathan Turner
864b3efd33
Fix tidy and nits
2016-08-17 15:53:10 -07:00
crypto-universe
ed54226467
Fix tidy check.
2016-08-18 00:43:18 +02:00
Jonathan Turner
70ce90c320
Move 'doesn't live long enough' errors to labels
2016-08-17 15:24:42 -07:00
Keith Yeung
34bc3c94f2
Display secondary span for E0053 for Mutability TypeErrors
2016-08-17 15:12:56 -07:00
crypto-universe
de5aaee0c5
Updated test for E0221
...
As a part of issue #35233
?r @GuillaumeGomez
2016-08-18 00:07:24 +02:00
Guillaume Gomez
8d78237701
Add new error code tests
2016-08-17 23:45:10 +02:00
Jonathan Turner
61865384b8
Replace local backtrace with def-use, repair std macro spans
2016-08-17 14:26:14 -07:00
crypto-universe
2179defa04
New output for E0407
...
Issue #35697 as a part of #35233 .
r? @jonathandturner
2016-08-17 19:59:22 +02:00
Chris Stankus
6a1efbd08e
Merge branch 'master' into E0403-update-error-format
2016-08-17 12:31:20 -05:00
Jacob
d01bfb122e
Remove trailing white space
2016-08-17 10:21:15 -07:00
Guillaume Gomez
feeed0b51b
Fixes issue #11004
2016-08-17 19:12:37 +02:00
Jonathan Turner
c216617cf2
Rollup merge of #35731 - pythoneer:fix-35192, r=jonathandturner
...
Update E0005 to use a label
Fixes #35192 as Part of #35233
r? @jonathandturner
2016-08-17 06:25:28 -07:00
Jonathan Turner
fbc62afba6
Rollup merge of #35726 - mikhail-m1:master2, r=jonathandturner
...
update E0409 to new error format
fixes #35699 as part of #35233 .
r? @jonathandturner
2016-08-17 06:25:28 -07:00
Jonathan Turner
5fc58dcaff
Rollup merge of #35722 - knight42:update-error-msg, r=jonathandturner
...
Updated E0394 & E0422 to new format
Fixes #35692 and #35700 , as part of #35233 .
r? @jonathandturner
2016-08-17 06:25:27 -07:00
Jonathan Turner
75454f72a3
Rollup merge of #35713 - sanxiyn:ui-test, r=nikomatsakis
...
Use UI test to test spans, instead of forced line break
There must be lots more, but these are what I could easily find.
2016-08-17 06:25:27 -07:00
Jonathan Turner
f0f12d9fb1
Rollup merge of #35686 - mikhail-m1:master, r=jonathandturner
...
update E0375 to new format
fixes #35635 as part of #35233 .
r? @jonathandturner
2016-08-17 06:25:26 -07:00
Jonathan Turner
eac17f1ee8
Rollup merge of #35672 - yossi-k:issue/35323, r=GuillaumeGomez
...
Update E0322 to new format
Fixes #35323 . Part of #35233 .
r? @GuillaumeGomez
2016-08-17 06:25:25 -07:00
Jonathan Turner
8ff8f77b77
Rollup merge of #35671 - canaltinova:E0392, r=jonathandturner
...
Update E0392 to new error format
Fixes #35631 . Part of #35233
r? @jonathandturner or @GuillaumeGomez
2016-08-17 06:25:25 -07:00
Jonathan Turner
02a8e2c285
Rollup merge of #35670 - RockyTV:e0365, r=jonathandturner
...
Update error E0365 to new format
Fixes #35633 as part of #35233 .
r? @jonathandturner
2016-08-17 06:25:25 -07:00