diff --git a/exercises/structs/structs1.rs b/exercises/structs/structs1.rs index 6d0b2f49..f489af92 100644 --- a/exercises/structs/structs1.rs +++ b/exercises/structs/structs1.rs @@ -3,11 +3,15 @@ // I AM NOT DONE +#[derive(Debug)] struct ColorClassicStruct { // TODO: Something goes here + name:String, + hex:String, } -struct ColorTupleStruct(/* TODO: Something goes here */); + +struct ColorTupleStruct(); #[derive(Debug)] struct UnitStruct; @@ -19,7 +23,8 @@ mod tests { #[test] fn classic_c_structs() { // TODO: Instantiate a classic c struct! - // let green = + let green = ColorClassicStruct{name:String::from("green"), + hex:String::from("#00FF00")}; assert_eq!(green.name, "green"); assert_eq!(green.hex, "#00FF00"); @@ -28,7 +33,7 @@ mod tests { #[test] fn tuple_structs() { // TODO: Instantiate a tuple struct! - // let green = + let green =(String::from("green"),String::from("#00FF00")); assert_eq!(green.0, "green"); assert_eq!(green.1, "#00FF00"); @@ -37,9 +42,16 @@ mod tests { #[test] fn unit_structs() { // TODO: Instantiate a unit struct! - // let unit_struct = - let message = format!("{:?}s are fun!", unit_struct); + let unit_structs =String::from("UnitStructsss"); + let message = format!("{:?}s are fun!", unit_structs); assert_eq!(message, "UnitStructs are fun!"); } } + + +fn main() { + let unit_structs =String::from("UnitStruct"); + let message = format!("{:?}s are fun!", unit_structs); + println!("{}",message); +} diff --git a/exercises/structs/structs2.rs b/exercises/structs/structs2.rs index f9c6427d..807ddabc 100644 --- a/exercises/structs/structs2.rs +++ b/exercises/structs/structs2.rs @@ -26,6 +26,7 @@ fn create_order_template() -> Order { } } + #[cfg(test)] mod tests { use super::*; @@ -34,7 +35,12 @@ mod tests { fn your_order() { let order_template = create_order_template(); // TODO: Create your own order using the update syntax and template above! - // let your_order = + let mut your_order=Order{ + name:String::from("Hacker in Rust"), + ..order_template + }; + + your_order.name=String::from("Hacker in Rust"); assert_eq!(your_order.name, "Hacker in Rust"); assert_eq!(your_order.year, order_template.year); assert_eq!(your_order.made_by_phone, order_template.made_by_phone);