diff options
| author | Corey Farwell <coreyf@rwell.org> | 2014-11-28 11:57:41 -0500 |
|---|---|---|
| committer | Corey Farwell <coreyf@rwell.org> | 2014-12-05 18:13:04 -0500 |
| commit | 4ef16741e355754abd446acbd80e5afb784864c7 (patch) | |
| tree | bfe4f64de5b3bcf88672424d0f66b5ad12fe7054 /src/doc/reference.md | |
| parent | 6f4c11be3b9706d1ba0e1b74b89de1478410a56f (diff) | |
| download | rust-4ef16741e355754abd446acbd80e5afb784864c7.tar.gz rust-4ef16741e355754abd446acbd80e5afb784864c7.zip | |
Utilize fewer reexports
In regards to: https://github.com/rust-lang/rust/issues/19253#issuecomment-64836729 This commit: * Changes the #deriving code so that it generates code that utilizes fewer reexports (in particur Option::* and Result::*), which is necessary to remove those reexports in the future * Changes other areas of the codebase so that fewer reexports are utilized
Diffstat (limited to 'src/doc/reference.md')
| -rw-r--r-- | src/doc/reference.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/doc/reference.md b/src/doc/reference.md index 47c25548af0..9ac4469d549 100644 --- a/src/doc/reference.md +++ b/src/doc/reference.md @@ -994,7 +994,7 @@ An example of `use` declarations: ``` use std::iter::range_step; -use std::option::{Some, None}; +use std::option::Option::{Some, None}; use std::collections::hash_map::{mod, HashMap}; fn foo<T>(_: T){} @@ -1004,8 +1004,8 @@ fn main() { // Equivalent to 'std::iter::range_step(0u, 10u, 2u);' range_step(0u, 10u, 2u); - // Equivalent to 'foo(vec![std::option::Some(1.0f64), - // std::option::None]);' + // Equivalent to 'foo(vec![std::option::Option::Some(1.0f64), + // std::option::Option::None]);' foo(vec![Some(1.0f64), None]); // Both `hash_map` and `HashMap` are in scope. |