Skip to content

Commit 54b57b5

Browse files
committed
---
yaml --- r: 210659 b: refs/heads/try c: aa529ef h: refs/heads/master i: 210657: 4db611b 210655: 7e2ec68 v: v3
1 parent cccd00f commit 54b57b5

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
@@ -2,7 +2,7 @@
22
refs/heads/master: 3e561f05c00cd180ec02db4ccab2840a4aba93d2
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
5-
refs/heads/try: ef030555c67988878e1a68743da25b5107bd2787
5+
refs/heads/try: aa529ef52e54039fcfaa8aa7914be4c581179497
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/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)