From 8c5de02289d515a367746d062b81e4d473e558ee Mon Sep 17 00:00:00 2001 From: Steven Stewart-Gallus Date: Sun, 12 May 2013 19:43:44 -0700 Subject: [PATCH] Fixed type signature of uninhabited method. Added unit test to prevent similar mistakes from happening again. The previous method was wrong because it dereferenced a pointer to a void type to match on the result. No self pointer was needed, and the correct method signature took the self value by value. --- src/libcore/util.rs | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/libcore/util.rs b/src/libcore/util.rs index ba176872b9a49..c6add76f94429 100644 --- a/src/libcore/util.rs +++ b/src/libcore/util.rs @@ -138,8 +138,8 @@ pub enum Void { } pub impl Void { /// A utility function for ignoring this uninhabited type - fn uninhabited(&self) -> ! { - match *self { + fn uninhabited(self) -> ! { + match self { // Nothing to match on } } @@ -177,7 +177,8 @@ pub fn unreachable() -> ! { #[cfg(test)] mod tests { use option::{None, Some}; - use util::{NonCopyable, id, replace, swap}; + use util::{Void, NonCopyable, id, replace, swap}; + use either::{Either, Left, Right}; #[test] pub fn identity_crisis() { @@ -202,4 +203,12 @@ mod tests { assert!(x.is_none()); assert!(y.is_some()); } + #[test] + pub fn test_uninhabited() { + let could_only_be_coin : Either = Right (()); + match could_only_be_coin { + Right (coin) => coin, + Left (is_void) => is_void.uninhabited () + } + } }