From 99a3c200e0e79df07dcdfb1a11e1fd91fa3203b9 Mon Sep 17 00:00:00 2001
From: Manuel Gil <manugildev@gmail.com>
Date: Sun, 1 Mar 2020 09:29:29 +0000
Subject: [PATCH] Solve structs
---
exercises/structs/structs1.rs | 20 +++++++++-----------
exercises/structs/structs2.rs | 12 +++++++++---
2 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/exercises/structs/structs1.rs b/exercises/structs/structs1.rs
index 6d0b2f4..b681c7c 100644
--- a/exercises/structs/structs1.rs
+++ b/exercises/structs/structs1.rs
@@ -1,13 +1,12 @@
// structs1.rs
// Address all the TODOs to make the tests pass!
-// I AM NOT DONE
-
struct ColorClassicStruct {
- // TODO: Something goes here
+ name: String,
+ hex: String,
}
-struct ColorTupleStruct(/* TODO: Something goes here */);
+struct ColorTupleStruct(String, String);
#[derive(Debug)]
struct UnitStruct;
@@ -18,8 +17,10 @@ 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");
@@ -27,17 +28,14 @@ mod tests {
#[test]
fn tuple_structs() {
- // TODO: Instantiate a tuple struct!
- // let green =
-
+ let green = ColorTupleStruct(String::from("green"), String::from("#00FF00"));
assert_eq!(green.0, "green");
assert_eq!(green.1, "#00FF00");
}
#[test]
fn unit_structs() {
- // TODO: Instantiate a unit struct!
- // let unit_struct =
+ let unit_struct = UnitStruct;
let message = format!("{:?}s are fun!", unit_struct);
assert_eq!(message, "UnitStructs are fun!");
diff --git a/exercises/structs/structs2.rs b/exercises/structs/structs2.rs
index 0699137..9fe740d 100644
--- a/exercises/structs/structs2.rs
+++ b/exercises/structs/structs2.rs
@@ -2,8 +2,6 @@
// Address all the TODOs to make the tests pass!
// No hints, just do it!
-// I AM NOT DONE
-
#[derive(Debug)]
struct Order {
name: String,
@@ -35,7 +33,15 @@ 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 your_order = Order {
+ name: String::from("Hacker in Rust"),
+ year: 2019,
+ made_by_phone: false,
+ made_by_mobile: false,
+ made_by_email: true,
+ item_number: 123,
+ count: 1
+ };
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);