From 9eeeba3d42d44aeb2c4b7f4bafeee4ddbcbc7656 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Fri, 31 May 2024 23:01:35 +0200 Subject: Update lasagna --- rust/lucians-luscious-lasagna/README.md | 2 +- rust/lucians-luscious-lasagna/src/lib.rs | 14 +++++++------- .../tests/lucians-luscious-lasagna.rs | 5 ----- 3 files changed, 8 insertions(+), 13 deletions(-) (limited to 'rust') diff --git a/rust/lucians-luscious-lasagna/README.md b/rust/lucians-luscious-lasagna/README.md index 4e40672..7040bc9 100644 --- a/rust/lucians-luscious-lasagna/README.md +++ b/rust/lucians-luscious-lasagna/README.md @@ -156,4 +156,4 @@ elapsed_time_in_minutes(3, 20) ### Created by - @coriolinus -- @ErikSchierboom \ No newline at end of file +- @ErikSchierboom diff --git a/rust/lucians-luscious-lasagna/src/lib.rs b/rust/lucians-luscious-lasagna/src/lib.rs index 67e5ba3..d6d7369 100644 --- a/rust/lucians-luscious-lasagna/src/lib.rs +++ b/rust/lucians-luscious-lasagna/src/lib.rs @@ -3,17 +3,17 @@ #![allow(unused)] pub fn expected_minutes_in_oven() -> i32 { - return 40 -} - -pub fn remaining_minutes_in_oven(actual_minutes_in_oven: i32) -> i32 { - return expected_minutes_in_oven() - actual_minutes_in_oven + 40 } pub fn preparation_time_in_minutes(number_of_layers: i32) -> i32 { - return number_of_layers * 2 + number_of_layers * 2 } pub fn elapsed_time_in_minutes(number_of_layers: i32, actual_minutes_in_oven: i32) -> i32 { - return preparation_time_in_minutes(number_of_layers) + actual_minutes_in_oven + preparation_time_in_minutes(number_of_layers) + actual_minutes_in_oven +} + +pub fn remaining_minutes_in_oven(actual_minutes_in_oven: i32) -> i32 { + expected_minutes_in_oven() - actual_minutes_in_oven } diff --git a/rust/lucians-luscious-lasagna/tests/lucians-luscious-lasagna.rs b/rust/lucians-luscious-lasagna/tests/lucians-luscious-lasagna.rs index ea381d8..340d476 100644 --- a/rust/lucians-luscious-lasagna/tests/lucians-luscious-lasagna.rs +++ b/rust/lucians-luscious-lasagna/tests/lucians-luscious-lasagna.rs @@ -8,31 +8,26 @@ fn expected_minutes_in_oven_is_correct() { assert_eq!(40, expected_minutes_in_oven()); } -#[ignore] #[test] fn remaining_minutes_in_oven_after_fifteen_minutes() { assert_eq!(15, remaining_minutes_in_oven(25)); } -#[ignore] #[test] fn preparation_time_in_minutes_for_one_layer() { assert_eq!(2, preparation_time_in_minutes(1)); } -#[ignore] #[test] fn preparation_time_in_minutes_for_multiple_layers() { assert_eq!(8, preparation_time_in_minutes(4)); } -#[ignore] #[test] fn elapsed_time_in_minutes_for_one_layer() { assert_eq!(32, elapsed_time_in_minutes(1, 30)); } -#[ignore] #[test] fn elapsed_time_in_minutes_for_multiple_layers() { assert_eq!(16, elapsed_time_in_minutes(4, 8)); -- cgit v1.2.3