Skip to content

Commit bb4fb2b

Browse files
---
yaml --- r: 219550 b: refs/heads/snap-stage3 c: e52b94e h: refs/heads/master v: v3
1 parent 3741330 commit bb4fb2b

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
refs/heads/master: c044791d80ea0dc5c4b57b6030a67b69f8510239
3-
refs/heads/snap-stage3: 67c11b0146d875260ffd7d44184221e42c01186c
3+
refs/heads/snap-stage3: e52b94e259b7f416ec584164e6803dcbf038b200
44
refs/heads/try: b53c0f93eedcdedd4fd89bccc5a3a09d1c5cd23e
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/snap-stage3/src/librustc_typeck/diagnostics.rs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -384,13 +384,15 @@ E0044: r##"
384384
You can't use type parameters on foreign items. Example of erroneous code:
385385
386386
```
387-
extern { fn some_func<T>(); }
387+
extern { fn some_func<T>(x: T); }
388388
```
389389
390-
Just remove the type parameter to make this code works:
390+
To fix this, replace the type parameter with the specializations that you
391+
need:
391392
392393
```
393-
extern { fn some_func(); }
394+
extern { fn some_func_i32(x: i32); }
395+
extern { fn some_func_i64(x: i64); }
394396
```
395397
396398
E0045: r##"
@@ -754,7 +756,7 @@ Example of erroneous code:
754756
enum Foo { f };
755757
756758
let u = Foo::f { value: 0i32 }; // error: Foo:f isn't a structure!
757-
// or even more simple:
759+
// or even simpler:
758760
let u = t { random_field: 0i32 }; //error: t isn't a structure!
759761
```
760762
@@ -772,7 +774,7 @@ enum Foo {
772774
773775
fn main() {
774776
let u = Foo::f(Inner { value: 0i32 });
775-
// or even more simple:
777+
// or even simpler:
776778
let t = Inner { value: 0i32 };
777779
}
778780
```
@@ -1533,9 +1535,6 @@ For more information see the [opt-in builtin traits RFC](https://github.com/rust
15331535
}
15341536

15351537
register_diagnostics! {
1536-
E0034, // multiple applicable methods in scope
1537-
E0035, // does not take type parameters
1538-
E0036, // incorrect number of type parameters given for this method
15391538
E0068,
15401539
E0074,
15411540
E0075,

0 commit comments

Comments
 (0)