about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-02-06 05:52:20 +0000
committerbors <bors@rust-lang.org>2015-02-06 05:52:20 +0000
commitf3573aa834627e52583a9895a8bac6206c56eeef (patch)
treebb09b5cc9c2269f88aa8696838d71ffb3e2e8ff4
parent715f9a5e8da73e04bff039dddc58800a5e6a24bd (diff)
parent98c46c30ed6f2ed43f984919c063d38651d6ea9a (diff)
downloadrust-f3573aa834627e52583a9895a8bac6206c56eeef.tar.gz
rust-f3573aa834627e52583a9895a8bac6206c56eeef.zip
Auto merge of #21609 - GarrettHeel:master, r=steveklabnik
Now that it's no longer feature gated, add docs for wildcard syntax.
-rw-r--r--src/doc/trpl/crates-and-modules.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/doc/trpl/crates-and-modules.md b/src/doc/trpl/crates-and-modules.md
index efeb201efe8..17b2cf7d0cc 100644
--- a/src/doc/trpl/crates-and-modules.md
+++ b/src/doc/trpl/crates-and-modules.md
@@ -551,6 +551,10 @@ module, we now have a `phrases::japanese::hello()` function and a
 `phrases::japanese::farewells::goodbye()`. Our internal organization doesn't
 define our external interface.
 
+Here we have a `pub use` for each function we want to bring into the 
+`japanese` scope. We could alternatively use the wildcard syntax to include
+everything from `greetings` into the current scope: `pub use self::greetings::*`. 
+
 Also, note that we `pub use`d before we declared our `mod`s. Rust requires that
 `use` declarations go first.