Skip to content

Commit bf06163

Browse files
committed
Remove references to deprecated extern crate "foo" as bar syntax
This syntax was removed in b24a3b8 but references remained in the grammar, the reference, rustdoc generation, and some auxiliary test files that don't seem to have been used since 812637e.
1 parent b210aea commit bf06163

File tree

7 files changed

+6
-71
lines changed

7 files changed

+6
-71
lines changed

src/doc/grammar.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ view_item : extern_crate_decl | use_decl ;
329329

330330
```antlr
331331
extern_crate_decl : "extern" "crate" crate_name
332-
crate_name: ident | ( string_lit as ident )
332+
crate_name: ident | ( ident "as" ident )
333333
```
334334

335335
##### Use declarations

src/doc/reference.md

+4-5
Original file line numberDiff line numberDiff line change
@@ -752,11 +752,10 @@ provided in the `extern_crate_decl`.
752752
The external crate is resolved to a specific `soname` at compile time, and a
753753
runtime linkage requirement to that `soname` is passed to the linker for
754754
loading at runtime. The `soname` is resolved at compile time by scanning the
755-
compiler's library path and matching the optional `crateid` provided as a
756-
string literal against the `crateid` attributes that were declared on the
757-
external crate when it was compiled. If no `crateid` is provided, a default
758-
`name` attribute is assumed, equal to the `ident` given in the
759-
`extern_crate_decl`.
755+
compiler's library path and matching the optional `crateid` provided against
756+
the `crateid` attributes that were declared on the external crate when it was
757+
compiled. If no `crateid` is provided, a default `name` attribute is assumed,
758+
equal to the `ident` given in the `extern_crate_decl`.
760759

761760
Three examples of `extern crate` declarations:
762761

src/librustdoc/html/render.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1643,7 +1643,7 @@ fn item_module(w: &mut fmt::Formatter, cx: &Context,
16431643
clean::ExternCrateItem(ref name, ref src) => {
16441644
match *src {
16451645
Some(ref src) => {
1646-
try!(write!(w, "<tr><td><code>{}extern crate \"{}\" as {};",
1646+
try!(write!(w, "<tr><td><code>{}extern crate {} as {};",
16471647
VisSpace(myitem.visibility),
16481648
src,
16491649
name))

src/test/auxiliary/crateresolve4a-1.rs

-14
This file was deleted.

src/test/auxiliary/crateresolve4a-2.rs

-14
This file was deleted.

src/test/auxiliary/crateresolve4b-1.rs

-18
This file was deleted.

src/test/auxiliary/crateresolve4b-2.rs

-18
This file was deleted.

0 commit comments

Comments
 (0)