Skip to content

Commit 5d95b0e

Browse files
committed
fixed usize input to i32, and fixed delete message after deleting a task.
1 parent b1220e9 commit 5d95b0e

4 files changed

Lines changed: 10 additions & 14 deletions

File tree

data/tasks.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,5 @@
1414
{
1515
"desc": "abcdef",
1616
"completed": false
17-
},
18-
{
19-
"desc": "mod testing",
20-
"completed": false
2117
}
2218
]

src/commands/complete.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
use crate::storage::{load_tasks, save_tasks, show_tasks};
22

3-
pub fn complete(id: usize) {
3+
pub fn complete(id: i32) {
44
let mut tasks = load_tasks();
5-
if id == 0 || id > tasks.len() {
5+
if id == 0 || id > tasks.len() as i32 {
66
println!("Invalid task ID");
77
show_tasks();
88
return;
99
}
10-
let index = id - 1;
10+
let index = (id - 1) as usize;
1111
tasks[index].completed = true;
1212
save_tasks(&tasks);
1313
show_tasks();

src/commands/delete.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
use crate::storage::{load_tasks, save_tasks, show_tasks};
22

3-
pub fn delete(id: usize) {
3+
pub fn delete(id: i32) {
44
let mut tasks = load_tasks();
5-
if id == 0 || id > tasks.len() {
5+
if id == 0 || id > tasks.len() as i32 {
66
println!("Invalid input, nothing was deleted, \nTry Again");
77
show_tasks();
88
return;
99
}
1010
let index = id - 1;
11+
let deleted = tasks[index as usize].desc.clone();
1112
tasks = tasks
1213
.into_iter()
1314
.enumerate()
14-
.filter(|(i, _)| *i != index)
15+
.filter(|(i, _)| *i != index as usize)
1516
.map(|(_, task)| task)
1617
.collect();
1718
save_tasks(&tasks);
18-
let deleted = &tasks[index].desc;
19-
println!("Deleted {:?} successfully", deleted);
19+
println!(r#"Deleted Task: "{}" successfully"#, deleted);
2020
show_tasks();
2121
}

src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ struct Cli {
2020
enum Commands {
2121
Add { desc: String },
2222
List,
23-
Complete { id: usize },
24-
Delete { id: usize },
23+
Complete { id: i32 },
24+
Delete { id: i32 },
2525
}
2626

2727
fn main() {

0 commit comments

Comments
 (0)