---

yaml
---
r: 30789
b: refs/heads/incoming
c: fbf3628
h: refs/heads/master
i:
  30787: a464537
v: v3

Author: graydon

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 385c4dfba00411da738aff96592281f0035e05f8
+refs/heads/incoming: fbf362809b89a97512c049ba7e4091ff3d404c58
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/doc/rust.md

@@ -783,9 +783,8 @@ link_attrs : link_attr [ ',' link_attrs ] + ;
 link_attr : ident '=' literal ;
 ~~~~~~~~
 
-An _extern mod declaration_ specifies a dependency on an external crate. The
-external crate is then imported into the declaring scope as the `ident`
-provided in the `extern_mod_decl`.
+An _extern mod declaration_ specifies a dependency on an external crate.
+The external crate is then bound into the declaring scope as the `ident` provided in the `extern_mod_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
@@ -825,16 +824,16 @@ linkage-dependency with external crates. Linkage dependencies are
 independently declared with
 [`extern mod` declarations](#extern-mod-declarations).
 
-Imports support a number of "convenience" notations:
+Use declarations support a number of "convenience" notations:
 
-  * Importing as a different name than the imported name, using the
+  * Rebinding the target name as a new local name, using the
     syntax `use x = p::q::r;`.
-  * Importing a list of paths differing only in final element, using
-    the glob-like brace syntax `use a::b::{c,d,e,f};`
-  * Importing all paths matching a given prefix, using the glob-like
-    asterisk syntax `use a::b::*;`
+  * Simultaneously binding a list of paths differing only in final element,
+    using the glob-like brace syntax `use a::b::{c,d,e,f};`
+  * Binding all paths matching a given prefix,
+    using the glob-like asterisk syntax `use a::b::*;`
 
-An example of imports:
+An example of `use` declarations:
 
 ~~~~
 use foo = core::info;
@@ -855,82 +854,11 @@ fn main() {
 }
 ~~~~
 
-##### Export declarations
-
-~~~~~~~~ {.ebnf .gram}
-export_decl : "export" ident [ ',' ident ] *
-            | "export" ident "::{}"
-            | "export" ident '{' ident [ ',' ident ] * '}' ;
-~~~~~~~~
-
-An _export declaration_ restricts the set of local names within a module that
-can be accessed from code outside the module. By default, all _local items_ in
-a module are exported; imported paths are not automatically re-exported by
-default. If a module contains an explicit `export` declaration, this
-declaration replaces the default export with the export specified.
-
-An example of an export:
-
-~~~~~~~~
-pub mod foo {
-	#[legacy_exports];
-    export primary;
-
-    fn primary() {
-        helper(1, 2);
-        helper(3, 4);
-    }
-
-    fn helper(x: int, y: int) {
-        ...
-    }
-}
-
-fn main() {
-    foo::primary();  // Will compile.
-}
-~~~~~~~~
-
-If, instead of calling `foo::primary` in main, you were to call `foo::helper`
-then it would fail to compile:
-
-~~~~~~~~{.ignore}
-    foo::helper(2,3) // ERROR: will not compile.
-~~~~~~~~
-
-Multiple names may be exported from a single export declaration:
-
-~~~~~~~~
-mod foo {
-    export primary, secondary;
-
-    fn primary() {
-        helper(1, 2);
-        helper(3, 4);
-    }
-
-    fn secondary() {
-        ...
-    }
-
-    fn helper(x: int, y: int) {
-        ...
-    }
-}
-~~~~~~~~
-
-When exporting the name of an `enum` type `t`, by default, the module does
-*not* implicitly export any of `t`'s constructors. For example:
-
-~~~~~~~~
-mod foo {
-    export t;
-
-    enum t {a, b, c}
-}
-~~~~~~~~
-
-Here, `foo` imports `t`, but not `a`, `b`, and `c`.
+Like items, `use` declarations are private to the containing module, by default.
+Also like items, a `use` declaration can be public, if qualified by the `pub` keyword.
+A public `use` declaration can therefore be used to _redirect_ some public name to a different target definition,
+even a definition with a private canonical path, inside a different module.
+If a sequence of such redirections form a cycle or cannot be unambiguously resolved, they represent a compile-time error.
 
 ### Functions