about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorCarol Nichols <carol.nichols@gmail.com>2015-05-08 20:48:54 -0400
committerCarol Nichols <carol.nichols@gmail.com>2015-05-08 20:48:54 -0400
commitbf06163ea7f41a54e7ef96ac9c5dfcd626299926 (patch)
tree433a764c049135efd237387e9d4671526737070b /src
parentb210aea1d446dcc9d05d0072c439575f9649d9f9 (diff)
downloadrust-bf06163ea7f41a54e7ef96ac9c5dfcd626299926.tar.gz
rust-bf06163ea7f41a54e7ef96ac9c5dfcd626299926.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/doc/grammar.md2
-rw-r--r--src/doc/reference.md9
-rw-r--r--src/librustdoc/html/render.rs2
-rw-r--r--src/test/auxiliary/crateresolve4a-1.rs14
-rw-r--r--src/test/auxiliary/crateresolve4a-2.rs14
-rw-r--r--src/test/auxiliary/crateresolve4b-1.rs18
-rw-r--r--src/test/auxiliary/crateresolve4b-2.rs18
7 files changed, 6 insertions, 71 deletions
diff --git a/src/doc/grammar.md b/src/doc/grammar.md
index 80a4b63cc5f..45a014e1076 100644
--- a/src/doc/grammar.md
+++ b/src/doc/grammar.md
@@ -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
diff --git a/src/doc/reference.md b/src/doc/reference.md
index ac65b934455..0d04b2d0e3c 100644
--- a/src/doc/reference.md
+++ b/src/doc/reference.md
@@ -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:
 
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
index 0642daeeb3a..6729557c840 100644
--- a/src/librustdoc/html/render.rs
+++ b/src/librustdoc/html/render.rs
@@ -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))
diff --git a/src/test/auxiliary/crateresolve4a-1.rs b/src/test/auxiliary/crateresolve4a-1.rs
deleted file mode 100644
index 579e93aa059..00000000000
--- a/src/test/auxiliary/crateresolve4a-1.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![crate_name="crateresolve4a#0.1"]
-#![crate_type = "lib"]
-
-pub fn f() -> isize { 10 }
diff --git a/src/test/auxiliary/crateresolve4a-2.rs b/src/test/auxiliary/crateresolve4a-2.rs
deleted file mode 100644
index 7da96e07b3f..00000000000
--- a/src/test/auxiliary/crateresolve4a-2.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![crate_name="crateresolve4a#0.2"]
-#![crate_type = "lib"]
-
-pub fn g() -> isize { 20 }
diff --git a/src/test/auxiliary/crateresolve4b-1.rs b/src/test/auxiliary/crateresolve4b-1.rs
deleted file mode 100644
index 9e4b0d158ec..00000000000
--- a/src/test/auxiliary/crateresolve4b-1.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// aux-build:crateresolve4a-1.rs
-// aux-build:crateresolve4a-2.rs
-#![crate_name="crateresolve4b#0.1"]
-#![crate_type = "lib"]
-
-extern crate "crateresolve4a#0.2" as crateresolve4a;
-
-pub fn f() -> isize { crateresolve4a::g() }
diff --git a/src/test/auxiliary/crateresolve4b-2.rs b/src/test/auxiliary/crateresolve4b-2.rs
deleted file mode 100644
index a50b8dbf957..00000000000
--- a/src/test/auxiliary/crateresolve4b-2.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// aux-build:crateresolve4a-1.rs
-// aux-build:crateresolve4a-2.rs
-#![crate_name="crateresolve4b#0.2"]
-#![crate_type = "lib"]
-
-extern crate "crateresolve4a#0.1" as crateresolve4a;
-
-pub fn g() -> isize { crateresolve4a::f() }