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/test/run-pass/nullable-pointer-iotareduction.rs | |
| parent | 6f4c11be3b9706d1ba0e1b74b89de1478410a56f (diff) | |
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/test/run-pass/nullable-pointer-iotareduction.rs')
| -rw-r--r-- | src/test/run-pass/nullable-pointer-iotareduction.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/run-pass/nullable-pointer-iotareduction.rs b/src/test/run-pass/nullable-pointer-iotareduction.rs index 520d067bca3..da1ad094df6 100644 --- a/src/test/run-pass/nullable-pointer-iotareduction.rs +++ b/src/test/run-pass/nullable-pointer-iotareduction.rs @@ -41,9 +41,9 @@ macro_rules! check_option { check_option!($e: $T, |ptr| assert!(*ptr == $e)); }}; ($e:expr: $T:ty, |$v:ident| $chk:expr) => {{ - assert!(option::None::<$T>.is_none()); + assert!(option::Option::None::<$T>.is_none()); let e = $e; - let s_ = option::Some::<$T>(e); + let s_ = option::Option::Some::<$T>(e); let $v = s_.as_ref().unwrap(); $chk }} |