Merge commit 'c6c3f47f7c72ddf45ba1bf6bae6bec3699d7212e' into rollup

This commit is contained in:
Alex Crichton 2014-08-06 11:25:42 -07:00
commit 1652d4ab08

View File

@ -3295,7 +3295,7 @@ fn times_four(x: int) -> int { x * 4 }
#[cfg(test)]
mod test {
use super::add_three;
use super::add_four;
use super::times_four;
#[test]
fn test_add_three() {
@ -3344,7 +3344,7 @@ about yet, and that's these lines:
```{rust,ignore}
use super::add_three;
use super::add_four;
use super::times_four;
```
Because we've made a nested module, we can import functions from the parent