Remove PartialEq str for Encoding.

Author: SSheldon

core/encode.rs

@@ -38,12 +38,6 @@ impl PartialEq for Encoding {
     }
 }
 
-impl<'a> PartialEq<&'a str> for Encoding {
-    fn eq(&self, other: &&'a str) -> bool {
-        self.as_str() == *other
-    }
-}
-
 impl fmt::Debug for Encoding {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "{}", self.as_str())
@@ -148,11 +142,11 @@ mod tests {
 
     #[test]
     fn test_encode() {
-        assert!(u32::encode() == encode!(u32));
-        assert!(<()>::encode() == "v");
-        assert!(<&Object>::encode() == "@");
-        assert!(<*mut Object>::encode() == "@");
-        assert!(<&Class>::encode() == "#");
-        assert!(Sel::encode() == encode!(Sel));
+        assert!(u32::encode().as_str() == "I");
+        assert!(<()>::encode().as_str() == "v");
+        assert!(<&Object>::encode().as_str() == "@");
+        assert!(<*mut Object>::encode().as_str() == "@");
+        assert!(<&Class>::encode().as_str() == "#");
+        assert!(Sel::encode().as_str() == ":");
     }
 }

core/examples/example.rs

@@ -34,7 +34,7 @@ fn main() {
     let hash_method = cls.instance_method(hash_sel).unwrap();
     let hash_return = hash_method.return_type();
     println!("-[NSObject hash] return type: {}", &*hash_return);
-    assert!(usize::encode() == &*hash_return);
+    assert!(usize::encode().as_str() == &*hash_return);
 
     // Invoke a method on the object
     let hash: usize = unsafe {

core/runtime.rs

@@ -371,7 +371,7 @@ impl Object {
         let cls = self.class();
         let ptr = match cls.instance_variable(name) {
             Some(ivar) => {
-                assert!(T::encode() == ivar.type_encoding());
+                assert!(T::encode().as_str() == ivar.type_encoding());
                 let offset = ivar.offset();
                 let self_ptr = self as *const Object;
                 (self_ptr as *const u8).offset(offset) as *const T
@@ -390,7 +390,7 @@ impl Object {
         let cls = self.class();
         let ptr = match cls.instance_variable(name) {
             Some(ivar) => {
-                assert!(T::encode() == ivar.type_encoding());
+                assert!(T::encode().as_str() == ivar.type_encoding());
                 let offset = ivar.offset();
                 let self_ptr = self as *mut Object;
                 (self_ptr as *mut u8).offset(offset) as *mut T

foundation/value.rs

@@ -13,7 +13,7 @@ pub trait INSValue : INSObject {
     type Value: 'static + Copy + Encode;
 
     fn value(&self) -> Self::Value {
-        assert!(Self::Value::encode() == self.encoding());
+        assert!(Self::Value::encode().as_str() == self.encoding());
         unsafe {
             let mut value = mem::uninitialized::<Self::Value>();
             let _: () = msg_send![self, getValue:&mut value];
@@ -70,6 +70,6 @@ mod tests {
     fn test_value() {
         let val = NSValue::from_value(13u32);
         assert!(val.value() == 13);
-        assert!(u32::encode() == val.encoding());
+        assert!(u32::encode().as_str() == val.encoding());
     }
 }