Migrate to rust edition 2024

This commit is contained in:
Joscha 2025-02-21 12:49:33 +01:00
parent cc74779e5d
commit 69f36de2d3
5 changed files with 13 additions and 7 deletions

View file

@ -23,6 +23,9 @@ jobs:
with: with:
version: 10 version: 10
- name: Set up rust
run: rustup update
# https://github.com/tauri-apps/tauri-action?tab=readme-ov-file#usage # https://github.com/tauri-apps/tauri-action?tab=readme-ov-file#usage
# https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/customizing-github-hosted-runners#installing-software-on-ubuntu-runners # https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/customizing-github-hosted-runners#installing-software-on-ubuntu-runners
- name: Install tauri dependencies - name: Install tauri dependencies
@ -52,6 +55,9 @@ jobs:
with: with:
version: 10 version: 10
- name: Set up rust
run: rustup update
- name: Build - name: Build
run: ./meta/build run: ./meta/build

View file

@ -1,10 +1,10 @@
[workspace] [workspace]
resolver = "2" resolver = "3"
members = ["gdn", "gdn-cli", "gdn-app/src-tauri"] members = ["gdn", "gdn-cli", "gdn-app/src-tauri"]
[workspace.package] [workspace.package]
version = "0.0.0" version = "0.0.0"
edition = "2021" edition = "2024"
[workspace.dependencies] [workspace.dependencies]
anyhow = "1.0.95" anyhow = "1.0.95"

View file

@ -10,7 +10,7 @@ use directories::ProjectDirs;
pub use self::{ pub use self::{
datadir::{LockedDataDir, UnlockedDataDir}, datadir::{LockedDataDir, UnlockedDataDir},
v1::{load_state, save_state, VERSION}, v1::{VERSION, load_state, save_state},
}; };
fn migrate(dir: &LockedDataDir) -> anyhow::Result<()> { fn migrate(dir: &LockedDataDir) -> anyhow::Result<()> {

View file

@ -6,9 +6,9 @@ use std::{
path::{Path, PathBuf}, path::{Path, PathBuf},
}; };
use anyhow::{anyhow, bail, Context}; use anyhow::{Context, anyhow, bail};
use rand::{distr::Alphanumeric, Rng}; use rand::{Rng, distr::Alphanumeric};
use serde::{de::DeserializeOwned, Serialize}; use serde::{Serialize, de::DeserializeOwned};
use super::lockfile::LockFile; use super::lockfile::LockFile;

View file

@ -1,6 +1,6 @@
// Just the empty directory // Just the empty directory
use super::{v1, LockedDataDir}; use super::{LockedDataDir, v1};
pub const VERSION: u32 = 0; pub const VERSION: u32 = 0;