From 716b19915deb514799d7fc6bdbe916589ac9c8f3 Mon Sep 17 00:00:00 2001 From: finchxx Date: Fri, 24 Jan 2025 21:20:28 +0800 Subject: [PATCH] update --- exercises/structs/structs1.rs | 14 +++++++++----- exercises/structs/structs2.rs | 8 +++++--- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/exercises/structs/structs1.rs b/exercises/structs/structs1.rs index 5fa5821c5..9e29fda41 100644 --- a/exercises/structs/structs1.rs +++ b/exercises/structs/structs1.rs @@ -5,13 +5,17 @@ // Execute `rustlings hint structs1` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE + +use std::arch::aarch64::{int32x2_t, int64x1_t}; struct ColorClassicStruct { // TODO: Something goes here + red: int32x2_t, + green: int32x2_t, + blue: int32x2_t, } -struct ColorTupleStruct(/* TODO: Something goes here */); +struct ColorTupleStruct(int32x2_t, int32x2_t, int32x2_t); #[derive(Debug)] struct UnitLikeStruct; @@ -23,7 +27,7 @@ mod tests { #[test] fn classic_c_structs() { // TODO: Instantiate a classic c struct! - // let green = + let green = ColorClassicStruct(0, 255, 0); assert_eq!(green.red, 0); assert_eq!(green.green, 255); @@ -33,7 +37,7 @@ mod tests { #[test] fn tuple_structs() { // TODO: Instantiate a tuple struct! - // let green = + let green = ColorTupleStruct(0,255,0); assert_eq!(green.0, 0); assert_eq!(green.1, 255); @@ -43,7 +47,7 @@ mod tests { #[test] fn unit_structs() { // TODO: Instantiate a unit-like struct! - // let unit_like_struct = + let unit_like_struct = UnitLikeStruct; let message = format!("{:?}s are fun!", unit_like_struct); assert_eq!(message, "UnitLikeStructs are fun!"); diff --git a/exercises/structs/structs2.rs b/exercises/structs/structs2.rs index 328567f03..a807cc9c8 100644 --- a/exercises/structs/structs2.rs +++ b/exercises/structs/structs2.rs @@ -5,8 +5,6 @@ // Execute `rustlings hint structs2` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE - #[derive(Debug)] struct Order { name: String, @@ -38,7 +36,11 @@ 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"), + count: 1, + ..order_template + }; 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);