summary refs log tree commit diff
path: root/src/libcore/tests
diff options
context:
space:
mode:
authorHunter Praska <hunter@wiggin-labs.com>2017-06-18 13:07:09 -0500
committerNiko Matsakis <niko@alum.mit.edu>2017-09-27 17:57:07 -0400
commit28996db803b958b235f5f3e95bc1762955de8a05 (patch)
tree8c1e30cbb2aefad2f51d91c75c06cf2fbeabbce5 /src/libcore/tests
parent8f63e8de464155e570ed81905ff203557dd02ac9 (diff)
downloadrust-28996db803b958b235f5f3e95bc1762955de8a05.tar.gz
rust-28996db803b958b235f5f3e95bc1762955de8a05.zip
Rename option::Missing to NoneError
Diffstat (limited to 'src/libcore/tests')
-rw-r--r--src/libcore/tests/option.rs6
-rw-r--r--src/libcore/tests/result.rs2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libcore/tests/option.rs b/src/libcore/tests/option.rs
index e2907e1dd89..22109e28edd 100644
--- a/src/libcore/tests/option.rs
+++ b/src/libcore/tests/option.rs
@@ -285,15 +285,15 @@ fn test_try() {
     }
     assert_eq!(try_option_none(), None);
 
-    fn try_option_ok() -> Result<u8, Missing> {
+    fn try_option_ok() -> Result<u8, NoneError> {
         let val = Some(1)?;
         Ok(val)
     }
     assert_eq!(try_option_ok(), Ok(1));
 
-    fn try_option_err() -> Result<u8, Missing> {
+    fn try_option_err() -> Result<u8, NoneError> {
         let val = None?;
         Ok(val)
     }
-    assert_eq!(try_option_err(), Err(Missing));
+    assert_eq!(try_option_err(), Err(NoneError));
 }
diff --git a/src/libcore/tests/result.rs b/src/libcore/tests/result.rs
index 37264980dc7..ce41bde8342 100644
--- a/src/libcore/tests/result.rs
+++ b/src/libcore/tests/result.rs
@@ -214,7 +214,7 @@ fn test_try() {
     assert_eq!(try_result_some(), Some(1));
 
     fn try_result_none() -> Option<u8> {
-        let val = Err(Missing)?;
+        let val = Err(NoneError)?;
         Some(val)
     }
     assert_eq!(try_result_none(), None);