Update to rust 2021

2021-10-22 12:55:12 +02:00
parent b4e1774993
commit 7698911078
5 changed files with 5 additions and 5 deletions
--- a/2
+++ b/2
@ -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
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@ -3,7 +3,7 @@ name = "stl_cli"
 version = "2.6.7"
 authors = ["Joakim Hulthe <joakim@hulthe.net>"]
 license = "MPL-2.0"
-edition = "2018"
+edition = "2021"

 [[bin]]
 name = "stl"
--- a/lib/Cargo.toml
+++ b/lib/Cargo.toml
@ -3,7 +3,7 @@ name = "stl_lib"
 version = "2.6.7"
 authors = ["Joakim Hulthe <joakim@hulthe.net>"]
 license = "MPL-2.0"
-edition = "2018"
+edition = "2021"


 [dependencies]
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@ -4,7 +4,7 @@ description = "studielogg aka scuffed toggl"
 version = "2.6.7"
 authors = ["Joakim Hulthe <joakim@hulthe.net>"]
 license = "MPL-2.0"
-edition = "2018"
+edition = "2021"

 [dependencies]
 dotenv = "0.13.0"
--- 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,