hulthe/stl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update to rust 2021

Browse Source
This commit is contained in:
Joakim Hulthe
2021-10-22 12:55:12 +02:00
parent b4e1774993
commit 7698911078
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -1,7 +1,7 @@
################## ##################
### BASE STAGE ### ### BASE STAGE ###
################## ##################
FROM rust:1.53 as base FROM rust:1.56 as base
# Install build dependencies # Install build dependencies
RUN cargo install strip_cargo_version RUN cargo install strip_cargo_version

2
cli/Cargo.toml
View File

@ -3,7 +3,7 @@ name = "stl_cli"
version = "2.6.7" version = "2.6.7"
authors = ["Joakim Hulthe <joakim@hulthe.net>"] authors = ["Joakim Hulthe <joakim@hulthe.net>"]
license = "MPL-2.0" license = "MPL-2.0"
edition = "2018" edition = "2021"
[[bin]] [[bin]]
name = "stl" name = "stl"

2
lib/Cargo.toml
View File

@ -3,7 +3,7 @@ name = "stl_lib"
version = "2.6.7" version = "2.6.7"
authors = ["Joakim Hulthe <joakim@hulthe.net>"] authors = ["Joakim Hulthe <joakim@hulthe.net>"]
license = "MPL-2.0" license = "MPL-2.0"
edition = "2018" edition = "2021"
[dependencies] [dependencies]

2
server/Cargo.toml
View File

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

2
server/src/routes/api/category.rs
View File

@ -101,7 +101,7 @@ pub fn set_parent(
} }
// this also makes sure that parent exists // 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 { match parent.parent {
Some(grandparent_id) => next_parent_id = grandparent_id, Some(grandparent_id) => next_parent_id = grandparent_id,