Associated consts are stable now, apparently

We still can't use associated consts for Readable::fixed_size because we need to be able to propigate optional-ness for parameterized types and the kinds of expressions allowed in constant contexts isn't expressive enough.
aprilwade · Oct 15, 2018 · 160a38a · 160a38a
1 parent 4716882
commit 160a38a
Show file tree

Hide file tree

Showing 19 changed files with 24 additions and 78 deletions.
diff --git a/structs/src/scly.rs b/structs/src/scly.rs
@@ -97,7 +97,7 @@ macro_rules! build_scly_property {
                 match *self {
                     SclyProperty::Unknown { object_type, .. } => object_type,
                     $(SclyProperty::$name(_) =>
-                      <scly_props::$name as SclyPropertyData>::object_type(),)*
+                      <scly_props::$name as SclyPropertyData>::OBJECT_TYPE,)*
                 }
             }
 
@@ -110,7 +110,7 @@ macro_rules! build_scly_property {
                 };
                 *self = if false {
                     return
-                } $(else if object_type == <scly_props::$name as SclyPropertyData>::object_type() {
+                } $(else if object_type == <scly_props::$name as SclyPropertyData>::OBJECT_TYPE {
                     SclyProperty::$name(reader.read(()))
                 })* else {
                     return
@@ -123,7 +123,7 @@ macro_rules! build_scly_property {
                     match *self {
                         SclyProperty::$name(_) => true,
                         SclyProperty::Unknown { object_type, .. } =>
-                            object_type == <scly_props::$name as SclyPropertyData>::object_type(),
+                            object_type == <scly_props::$name as SclyPropertyData>::OBJECT_TYPE,
                         _ => false,
                     }
                 }
@@ -133,7 +133,7 @@ macro_rules! build_scly_property {
                     match *self {
                         SclyProperty::$name(ref inst) => Some(Cow::Borrowed(inst)),
                         SclyProperty::Unknown { ref data, object_type, .. } => {
-                            if object_type == <scly_props::$name as SclyPropertyData>::object_type() {
+                            if object_type == <scly_props::$name as SclyPropertyData>::OBJECT_TYPE {
                                 Some(Cow::Owned(data.clone().read(())))
                             } else {
                                 None
@@ -151,7 +151,7 @@ macro_rules! build_scly_property {
                         SclyProperty::$name(ref mut inst) => return Some(inst),
                         _ => return None,
                     };
-                    if object_type != <scly_props::$name as SclyPropertyData>::object_type() {
+                    if object_type != <scly_props::$name as SclyPropertyData>::OBJECT_TYPE {
                         return None
                     }
                     *self = SclyProperty::$name(data.read(()));
@@ -221,7 +221,7 @@ build_scly_property!(
 
 pub trait SclyPropertyData
 {
-    fn object_type() -> u8;
+    const OBJECT_TYPE: u8;
 }
 
 

diff --git a/structs/src/scly_props/actor.rs b/structs/src/scly_props/actor.rs
@@ -48,8 +48,5 @@ auto_struct! {
 
 impl<'a> SclyPropertyData for Actor<'a>
 {
-    fn object_type() -> u8
-    {
-        0x0
-    }
+    const OBJECT_TYPE: u8 = 0x0;
 }
diff --git a/structs/src/scly_props/dock.rs b/structs/src/scly_props/dock.rs
@@ -25,8 +25,5 @@ auto_struct! {
 
 impl<'a> SclyPropertyData for Dock<'a>
 {
-    fn object_type() -> u8
-    {
-        0x0B
-    }
+    const OBJECT_TYPE: u8 = 0x0B;
 }
diff --git a/structs/src/scly_props/effect.rs b/structs/src/scly_props/effect.rs
@@ -47,8 +47,5 @@ auto_struct! {
 
 impl<'a> SclyPropertyData for Effect<'a>
 {
-    fn object_type() -> u8
-    {
-        0x7
-    }
+    const OBJECT_TYPE: u8 = 0x7;
 }
diff --git a/structs/src/scly_props/hud_memo.rs b/structs/src/scly_props/hud_memo.rs
@@ -22,8 +22,5 @@ auto_struct! {
 
 impl<'a> SclyPropertyData for HudMemo<'a>
 {
-    fn object_type() -> u8
-    {
-        0x17
-    }
+    const OBJECT_TYPE: u8 = 0x17;
 }
diff --git a/structs/src/scly_props/memory_relay.rs b/structs/src/scly_props/memory_relay.rs
@@ -19,8 +19,5 @@ auto_struct! {
 
 impl<'a> SclyPropertyData for MemoryRelay<'a>
 {
-    fn object_type() -> u8
-    {
-        0x13
-    }
+    const OBJECT_TYPE: u8 = 0x13;
 }
diff --git a/structs/src/scly_props/pickup.rs b/structs/src/scly_props/pickup.rs
@@ -43,8 +43,5 @@ auto_struct! {
 
 impl<'a> SclyPropertyData for Pickup<'a>
 {
-    fn object_type() -> u8
-    {
-        0x11
-    }
+    const OBJECT_TYPE: u8 = 0x11;
 }
diff --git a/structs/src/scly_props/platorm.rs b/structs/src/scly_props/platorm.rs
@@ -44,8 +44,5 @@ auto_struct! {
 
 impl<'a> SclyPropertyData for Platform<'a>
 {
-    fn object_type() -> u8
-    {
-        0x8
-    }
+    const OBJECT_TYPE: u8 = 0x8;
 }
diff --git a/structs/src/scly_props/player_actor.rs b/structs/src/scly_props/player_actor.rs
@@ -44,8 +44,5 @@ auto_struct! {
 
 impl<'a> SclyPropertyData for PlayerActor<'a>
 {
-    fn object_type() -> u8
-    {
-        0x4c
-    }
+    const OBJECT_TYPE: u8 = 0x4c;
 }
diff --git a/structs/src/scly_props/player_hint.rs b/structs/src/scly_props/player_hint.rs
@@ -40,8 +40,5 @@ auto_struct! {
 
 impl<'a> SclyPropertyData for PlayerHint<'a>
 {
-    fn object_type() -> u8
-    {
-        0x3E
-    }
+    const OBJECT_TYPE: u8 = 0x3E;
 }
diff --git a/structs/src/scly_props/point_of_interest.rs b/structs/src/scly_props/point_of_interest.rs
@@ -25,8 +25,5 @@ auto_struct! {
 
 impl<'a> SclyPropertyData for PointOfInterest<'a>
 {
-    fn object_type() -> u8
-    {
-        0x42
-    }
+    const OBJECT_TYPE: u8 = 0x42;
 }
diff --git a/structs/src/scly_props/relay.rs b/structs/src/scly_props/relay.rs
@@ -18,8 +18,5 @@ auto_struct! {
 
 impl<'a> SclyPropertyData for Relay<'a>
 {
-    fn object_type() -> u8
-    {
-        0x15
-    }
+    const OBJECT_TYPE: u8 = 0x15;
 }
diff --git a/structs/src/scly_props/sound.rs b/structs/src/scly_props/sound.rs
@@ -24,8 +24,5 @@ auto_struct! {
 
 impl<'a> SclyPropertyData for Sound<'a>
 {
-    fn object_type() -> u8
-    {
-        0x9
-    }
+    const OBJECT_TYPE: u8 = 0x9;
 }
diff --git a/structs/src/scly_props/spawn_point.rs b/structs/src/scly_props/spawn_point.rs
@@ -56,8 +56,5 @@ auto_struct! {
 
 impl<'a> SclyPropertyData for SpawnPoint<'a>
 {
-    fn object_type() -> u8
-    {
-        0x0F
-    }
+    const OBJECT_TYPE: u8 = 0x0F;
 }
diff --git a/structs/src/scly_props/special_function.rs b/structs/src/scly_props/special_function.rs
@@ -40,8 +40,5 @@ auto_struct! {
 
 impl<'a> SclyPropertyData for SpecialFunction<'a>
 {
-    fn object_type() -> u8
-    {
-        0x3A
-    }
+    const OBJECT_TYPE: u8 = 0x3A;
 }
diff --git a/structs/src/scly_props/streamed_audio.rs b/structs/src/scly_props/streamed_audio.rs
@@ -24,8 +24,5 @@ auto_struct! {
 
 impl<'a> SclyPropertyData for StreamedAudio<'a>
 {
-    fn object_type() -> u8
-    {
-        0x61
-    }
+    const OBJECT_TYPE: u8 = 0x61;
 }
diff --git a/structs/src/scly_props/timer.rs b/structs/src/scly_props/timer.rs
@@ -22,8 +22,5 @@ auto_struct! {
 
 impl<'a> SclyPropertyData for Timer<'a>
 {
-    fn object_type() -> u8
-    {
-        0x5
-    }
+    const OBJECT_TYPE: u8 = 0x5;
 }
diff --git a/structs/src/scly_props/trigger.rs b/structs/src/scly_props/trigger.rs
@@ -29,8 +29,5 @@ auto_struct! {
 
 impl<'a> SclyPropertyData for Trigger<'a>
 {
-    fn object_type() -> u8
-    {
-        0x04
-    }
+    const OBJECT_TYPE: u8 = 0x04;
 }
diff --git a/structs/src/scly_props/world_transporter.rs b/structs/src/scly_props/world_transporter.rs
@@ -40,8 +40,5 @@ auto_struct! {
 
 impl<'a> SclyPropertyData for WorldTransporter<'a>
 {
-    fn object_type() -> u8
-    {
-        0x062
-    }
+    const OBJECT_TYPE: u8 = 0x062;
 }