Merge remote-tracking branch 'upstream/main' into fix-enum-variant-inconsistency

1 files changed, 19 insertions, 20 deletions

diff --git a/exercises/15_traits/traits5.rs b/exercises/15_traits/traits5.rs
index df18380..5b356ac 100644
--- a/exercises/15_traits/traits5.rs
+++ b/exercises/15_traits/traits5.rs
@@ -1,40 +1,39 @@
-// traits5.rs
-//
-// Your task is to replace the '??' sections so the code compiles.
-//
-// Don't change any line other than the marked one.
-//
-// Execute `rustlings hint traits5` or use the `hint` watch subcommand for a
-// hint.
-
-// I AM NOT DONE
-
-pub trait SomeTrait {
+trait SomeTrait {
     fn some_function(&self) -> bool {
         true
     }
 }
 
-pub trait OtherTrait {
+trait OtherTrait {
     fn other_function(&self) -> bool {
         true
     }
 }
 
-struct SomeStruct {}
-struct OtherStruct {}
-
+struct SomeStruct;
 impl SomeTrait for SomeStruct {}
 impl OtherTrait for SomeStruct {}
+
+struct OtherStruct;
 impl SomeTrait for OtherStruct {}
 impl OtherTrait for OtherStruct {}
 
-// YOU MAY ONLY CHANGE THE NEXT LINE
-fn some_func(item: ??) -> bool {
+// TODO: Fix the compiler error by only changing the signature of this function.
+fn some_func(item: ???) -> bool {
     item.some_function() && item.other_function()
 }
 
 fn main() {
-    some_func(SomeStruct {});
-    some_func(OtherStruct {});
+    // You can optionally experiment here.
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_some_func() {
+        assert!(some_func(SomeStruct));
+        assert!(some_func(OtherStruct));
+    }
 }