about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-10-02 14:50:27 -0700
committerAlex Crichton <alex@alexcrichton.com>2014-10-02 14:50:27 -0700
commit6ee3c2854fb315bba7b4a3ff9ec4e826bfda3b00 (patch)
tree9952587953b491e66547241eb0754f3c4d6ef1c4 /src
parent979f7cd7d7f2e3312006a212ca7a3484ebbc0140 (diff)
parentac956c013f5064eadc14e581b833dfddd173a206 (diff)
downloadrust-6ee3c2854fb315bba7b4a3ff9ec4e826bfda3b00.tar.gz
rust-6ee3c2854fb315bba7b4a3ff9ec4e826bfda3b00.zip
rollup merge of #17698 : jistr/guide_export
Diffstat (limited to 'src')
-rw-r--r--src/doc/guide.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/doc/guide.md b/src/doc/guide.md
index 3ffb7cad0a4..49b589ee898 100644
--- a/src/doc/guide.md
+++ b/src/doc/guide.md
@@ -2725,7 +2725,8 @@ mod hello {
 }
 ```
 
-This will work:
+Usage of the `pub` keyword is sometimes called 'exporting', because
+we're making the function available for other modules. This will work:
 
 ```{notrust,ignore}
 $ cargo run
@@ -3289,8 +3290,7 @@ use super::times_four;
 
 Because we've made a nested module, we can import functions from the parent
 module by using `super`. Sub-modules are allowed to 'see' private functions in
-the parent. We sometimes call this usage of `use` a 're-export,' because we're
-exporting the name again, somewhere else.
+the parent.
 
 We've now covered the basics of testing. Rust's tools are primitive, but they
 work well in the simple cases. There are some Rustaceans working on building