Skip to content

Commit 6a4c23e

Browse files
---
yaml --- r: 232653 b: refs/heads/try c: 5650709 h: refs/heads/master i: 232651: 71da5b4 v: v3
1 parent 17c898a commit 6a4c23e

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: edeb4f1c86cbf6af8ef9874d4b3af50f721ea1b8
33
refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
4-
refs/heads/try: 73b369d7ab5999eaebeff402edd1b2405b766a4a
4+
refs/heads/try: 565070948f8b2aff522d522b7a4be65790570b41
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/librustc_typeck/diagnostics.rs

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2482,7 +2482,8 @@ impl Foo for Bar {
24822482
}
24832483
```
24842484
2485-
To fix this error, please verify you didn't misspell the method name. Example:
2485+
To fix this error, please verify that the method name wasn't misspelled and
2486+
verify that you are indeed implementing the correct trait items. Example:
24862487
24872488
```
24882489
struct Bar;
@@ -2519,9 +2520,8 @@ impl Foo for Bar {
25192520
}
25202521
```
25212522
2522-
To fix this error, please verify you didn't misspell the associated type name
2523-
and that your trait item implementation corresponds to the trait definition.
2524-
Example:
2523+
Please verify that the associated type name wasn't misspelled and your
2524+
implementation corresponds to the trait definition. Example:
25252525
25262526
```
25272527
struct Bar;
@@ -2722,8 +2722,8 @@ let x = 12f32; // error: binary operation `<<` cannot be applied to
27222722
x << 2;
27232723
```
27242724
2725-
To fix this error, please check this type implements this binary operation.
2726-
Example:
2725+
To fix this error, please check that this type implements this binary
2726+
operation. Example:
27272727
27282728
```
27292729
let x = 12u32; // the `u32` type does implement it:
@@ -2775,7 +2775,8 @@ For more information see the [opt-in builtin traits RFC](https://github.com/rust
27752775
"##,
27762776

27772777
E0390: r##"
2778-
You tried to implement on an `*mut T` type. Erroneous code example:
2778+
You tried to implement methods for a mutable raw pointer (*mut T). Erroneous
2779+
code example:
27792780
27802781
```
27812782
struct Foo {
@@ -2787,7 +2788,12 @@ impl *mut Foo {}
27872788
// `#[lang = "mut_ptr"]` is allowed for the `*mut T` primitive
27882789
```
27892790
2790-
To fix this, please follow the compiler recommendations.
2791+
This isn't allowed, perhaps you might get the desired effects by wrapping the
2792+
raw pointer in a struct. Example:
2793+
2794+
```
2795+
struct FooPtr(pub *mut Foo);
2796+
```
27912797
"##,
27922798

27932799
E0391: r##"

0 commit comments

Comments
 (0)