Remove trait

unicode-org · Jun 2, 2022 · 7368973 · 7368973
1 parent f03d476
commit 7368973
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/utils/preferences/src/macros.rs b/utils/preferences/src/macros.rs
@@ -1,13 +1,13 @@
 #[macro_export]
 macro_rules! preferences {
-    ($trait:ident, $name:ident, $resolved_name:ident, {$($key:ident => $pref:ty, $resolved:ty, $ue:expr),*}) => (
-        pub trait $trait: Preferences {
-            $(
-                fn $key(&self) -> $pref {
-                    None
-                }
-            )*
-        }
+    ($name:ident, $resolved_name:ident, {$($key:ident => $pref:ty, $resolved:ty, $ue:expr),*}) => (
+        // pub trait $trait: Preferences {
+        //     $(
+        //         fn $key(&self) -> $pref {
+        //             None
+        //         }
+        //     )*
+        // }
 
         #[derive(Default)]
         #[non_exhaustive]
@@ -43,13 +43,13 @@ macro_rules! preferences {
             }
         }
 
-        impl $trait for $name {
-            $(
-                fn $key(&self) -> $pref {
-                    self.$key
-                }
-            )*
-        }
+        // impl $trait for $name {
+        //     $(
+        //         fn $key(&self) -> $pref {
+        //             self.$key
+        //         }
+        //     )*
+        // }
 
         impl TryFrom<Locale> for $name {
             type Error = ();
@@ -121,7 +121,7 @@ macro_rules! preferences {
                     language = &self.lid.language;
                 }
                 $(
-                    if let Some(v) = prefs.$key() {
+                    if let Some(v) = prefs.$key {
                         self.$key = v;
                     }
                 )*

diff --git a/utils/preferences/tests/dtf.rs b/utils/preferences/tests/dtf.rs
@@ -21,7 +21,6 @@ impl TryFrom<&icu_locid::extensions::unicode::Value> for Calendar {
 }
 
 preferences!(
-    DTFPreferences,
     DTFPreferencesBag,
     ResolvedDTFPreferencesBag,
     {