From 7698911078dfa05176fa5ea3b36769413602389c Mon Sep 17 00:00:00 2001 From: Joakim Hulthe Date: Fri, 22 Oct 2021 12:55:12 +0200 Subject: [PATCH] Update to rust 2021 --- Dockerfile | 2 +- cli/Cargo.toml | 2 +- lib/Cargo.toml | 2 +- server/Cargo.toml | 2 +- server/src/routes/api/category.rs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0e622e0..29c3b5a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ################## ### BASE STAGE ### ################## -FROM rust:1.53 as base +FROM rust:1.56 as base # Install build dependencies RUN cargo install strip_cargo_version diff --git a/cli/Cargo.toml b/cli/Cargo.toml index ccd4322..68908fa 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -3,7 +3,7 @@ name = "stl_cli" version = "2.6.7" authors = ["Joakim Hulthe "] license = "MPL-2.0" -edition = "2018" +edition = "2021" [[bin]] name = "stl" diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 9c020b9..7a3a344 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -3,7 +3,7 @@ name = "stl_lib" version = "2.6.7" authors = ["Joakim Hulthe "] license = "MPL-2.0" -edition = "2018" +edition = "2021" [dependencies] diff --git a/server/Cargo.toml b/server/Cargo.toml index 549ba03..bc61254 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -4,7 +4,7 @@ description = "studielogg aka scuffed toggl" version = "2.6.7" authors = ["Joakim Hulthe "] license = "MPL-2.0" -edition = "2018" +edition = "2021" [dependencies] dotenv = "0.13.0" diff --git a/server/src/routes/api/category.rs b/server/src/routes/api/category.rs index 103cc90..ba23479 100644 --- a/server/src/routes/api/category.rs +++ b/server/src/routes/api/category.rs @@ -101,7 +101,7 @@ pub fn set_parent( } // this also makes sure that parent exists - let parent = category::get(&categories_tree, &&next_parent_id)?; + let parent = category::get(&categories_tree, &next_parent_id)?; match parent.parent { Some(grandparent_id) => next_parent_id = grandparent_id,