Skip to content

Commit b54d9c8

Browse files
committed
---
yaml --- r: 205069 b: refs/heads/tmp c: aa529ef h: refs/heads/master i: 205067: 49a83b1 v: v3
1 parent 33282b6 commit b54d9c8

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
3232
refs/heads/beta: f0213d8ffb128a16f94af7ee985dc61484596163
3333
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3434
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
35-
refs/heads/tmp: ef030555c67988878e1a68743da25b5107bd2787
35+
refs/heads/tmp: aa529ef52e54039fcfaa8aa7914be4c581179497
3636
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3737
refs/tags/homu-tmp: f0ac7e04e647381e2bb87de1f3d0b108acb24d06
3838
refs/heads/gate: 97c84447b65164731087ea82685580cc81424412

branches/tmp/src/librustc_resolve/diagnostics.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,17 @@ has been imported into the current module.
5353
5454
Wrong example:
5555
```
56-
extern a;
57-
extern crate_a as a;
56+
extern crate a;
57+
extern crate crate_a as a;
5858
```
5959
6060
The solution is to choose a different name that doesn't conflict with any
6161
external crate imported into the current module.
6262
6363
Correct example:
6464
```
65-
extern a;
66-
extern crate_a as other_name;
65+
extern crate a;
66+
extern crate crate_a as other_name;
6767
```
6868
"##,
6969

@@ -72,7 +72,7 @@ The name for an item declaration conflicts with an external crate's name.
7272
7373
For instance,
7474
```
75-
extern abc;
75+
extern crate abc;
7676
7777
struct abc;
7878
```
@@ -82,15 +82,15 @@ There are two possible solutions:
8282
Solution #1: Rename the item.
8383
8484
```
85-
extern abc;
85+
extern crate abc;
8686
8787
struct xyz;
8888
```
8989
9090
Solution #2: Import the crate with a different name.
9191
9292
```
93-
extern abc as xyz;
93+
extern crate abc as xyz;
9494
9595
struct abc;
9696
```

0 commit comments

Comments
 (0)