Skip to content

Commit

Permalink
Auto merge of #25231 - carols10cents:lingering-quoted-crate-names, r=…
Browse files Browse the repository at this point in the history
…alexcrichton

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.

Thanks!! 💟
  • Loading branch information
bors committed May 9, 2015
2 parents 50aada7 + bf06163 commit 7129b25
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 71 deletions.
2 changes: 1 addition & 1 deletion src/doc/grammar.md
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ view_item : extern_crate_decl | use_decl ;

```antlr
extern_crate_decl : "extern" "crate" crate_name
crate_name: ident | ( string_lit as ident )
crate_name: ident | ( ident "as" ident )
```

##### Use declarations
Expand Down
9 changes: 4 additions & 5 deletions src/doc/reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -752,11 +752,10 @@ provided in the `extern_crate_decl`.
The external crate is resolved to a specific `soname` at compile time, and a
runtime linkage requirement to that `soname` is passed to the linker for
loading at runtime. The `soname` is resolved at compile time by scanning the
compiler's library path and matching the optional `crateid` provided as a
string literal against the `crateid` attributes that were declared on the
external crate when it was compiled. If no `crateid` is provided, a default
`name` attribute is assumed, equal to the `ident` given in the
`extern_crate_decl`.
compiler's library path and matching the optional `crateid` provided against
the `crateid` attributes that were declared on the external crate when it was
compiled. If no `crateid` is provided, a default `name` attribute is assumed,
equal to the `ident` given in the `extern_crate_decl`.

Three examples of `extern crate` declarations:

Expand Down
2 changes: 1 addition & 1 deletion src/librustdoc/html/render.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1643,7 +1643,7 @@ fn item_module(w: &mut fmt::Formatter, cx: &Context,
clean::ExternCrateItem(ref name, ref src) => {
match *src {
Some(ref src) => {
try!(write!(w, "<tr><td><code>{}extern crate \"{}\" as {};",
try!(write!(w, "<tr><td><code>{}extern crate {} as {};",
VisSpace(myitem.visibility),
src,
name))
Expand Down
14 changes: 0 additions & 14 deletions src/test/auxiliary/crateresolve4a-1.rs

This file was deleted.

14 changes: 0 additions & 14 deletions src/test/auxiliary/crateresolve4a-2.rs

This file was deleted.

18 changes: 0 additions & 18 deletions src/test/auxiliary/crateresolve4b-1.rs

This file was deleted.

18 changes: 0 additions & 18 deletions src/test/auxiliary/crateresolve4b-2.rs

This file was deleted.

0 comments on commit 7129b25

Please sign in to comment.