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

1 files changed, 13 insertions, 15 deletions

diff --git a/exercises/15_traits/traits3.rs b/exercises/15_traits/traits3.rs
index 4e2b06b..2e8969e 100644
--- a/exercises/15_traits/traits3.rs
+++ b/exercises/15_traits/traits3.rs
@@ -1,16 +1,10 @@
-// traits3.rs
-//
-// Your task is to implement the Licensed trait for both structures and have
-// them return the same information without writing the same function twice.
-//
-// Consider what you can add to the Licensed trait.
-//
-// Execute `rustlings hint traits3` or use the `hint` watch subcommand for a
-// hint.
+#![allow(dead_code)]
 
-// I AM NOT DONE
-
-pub trait Licensed {
+trait Licensed {
+    // TODO: Add a default implementation for `licensing_info` so that
+    // implementors like the two structs below can share that default behavior
+    // without repeating the function.
+    // The default license information should be the string "Default license".
     fn licensing_info(&self) -> String;
 }
 
@@ -22,8 +16,12 @@ struct OtherSoftware {
     version_number: String,
 }
 
-impl Licensed for SomeSoftware {} // Don't edit this line
-impl Licensed for OtherSoftware {} // Don't edit this line
+impl Licensed for SomeSoftware {} // Don't edit this line.
+impl Licensed for OtherSoftware {} // Don't edit this line.
+
+fn main() {
+    // You can optionally experiment here.
+}
 
 #[cfg(test)]
 mod tests {
@@ -31,7 +29,7 @@ mod tests {
 
     #[test]
     fn is_licensing_info_the_same() {
-        let licensing_info = String::from("Some information");
+        let licensing_info = "Default license";
         let some_software = SomeSoftware { version_number: 1 };
         let other_software = OtherSoftware {
             version_number: "v2.0.0".to_string(),