chore(anni): upgrade to rust 2024

Author: Yesterday17

.envrc

@@ -0,0 +1 @@
+use_flake

.gitignore

@@ -12,4 +12,6 @@ perf.data.old
 repo.json
 
 .cargo
-/fleet.toml
+/fleet.toml
+
+.direnv

Cargo.toml

@@ -16,7 +16,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-edition = "2021"
+edition = "2024"
 authors = ["Yesterday17 <mmf@mmf.moe>"]
 repository = "https://github.com/ProjectAnni/anni"
 license = "Apache-2.0"

anni-metadata/Cargo.toml

@@ -29,5 +29,5 @@ cynic-codegen = { version = "3" }
 tokio = { version = "1", features = ["full"] }
 
 [features]
-default = ["annim"]
+default = []
 annim = ["reqwest", "cynic"]

anni-provider/src/providers/proxy.rs

@@ -110,7 +110,7 @@ impl AnniProvider for ProxyBackend {
     ) -> Result<ResourceReader, ProviderError> {
         let path = match disc_id {
             Some(disc_id) => format!("/{album_id}/{disc_id}/cover"),
-            None => format!("/{album_id}/cover"),
+            _ => format!("/{album_id}/cover"),
         };
         let resp = self
             .get(&path, &Range::FULL)
@@ -133,12 +133,12 @@ impl AnniProvider for ProxyBackend {
 fn audio_info_from_response(response: &Response) -> Result<AudioInfo, ProviderError> {
     let original_size = match response.headers().get("x-origin-size") {
         Some(s) => s.to_str().unwrap_or("0"),
-        None => "0",
+        _ => "0",
     }
     .to_string();
     let duration = match response.headers().get("x-duration-seconds") {
         Some(s) => s.to_str().unwrap_or("0"),
-        None => "0",
+        _ => "0",
     }
     .to_string();
     let extension = match response.headers().get("Content-Type") {

anni-repo/Cargo.toml

@@ -52,7 +52,7 @@ lindera-dictionary = { version = "0.27.2", optional = true }
 lindera-tantivy = { version = "0.27.1", optional = true, features = [
     "ipadic-compress",
 ] }
-anni-metadata = { workspace = true, default-features = false }
+anni-metadata.workspace = true
 
 
 # WASM dependencies

anni-repo/src/models/json.rs

@@ -1,10 +1,7 @@
 use std::{collections::HashMap, str::FromStr};
 
 use crate::error::Error;
-use anni_metadata::{
-    annim::query::album::AlbumFragment,
-    model::{Album, AlbumInfo, AnniDate, Disc, TagString, TrackType},
-};
+use anni_metadata::model::{Album, AlbumInfo, AnniDate, Disc, TagString, TrackType};
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 
@@ -65,13 +62,6 @@ impl ToString for JsonAlbum {
     }
 }
 
-impl From<AlbumFragment> for JsonAlbum {
-    fn from(album: AlbumFragment) -> JsonAlbum {
-        let album: Album = album.into();
-        album.into()
-    }
-}
-
 impl From<Album> for JsonAlbum {
     fn from(album: Album) -> JsonAlbum {
         let AlbumInfo {

anni/Cargo.toml

@@ -2,6 +2,7 @@
 name = "anni"
 version = "0.1.1"
 publish = false
+default-run = "anni"
 
 edition.workspace = true
 repository.workspace = true
@@ -33,7 +34,7 @@ anni-repo = { path = "../anni-repo", features = [
 anni-provider = { path = "../anni-provider" }
 annil = { path = "../annil", default-features = false }
 anni-workspace = { path = "../anni-workspace" }
-anni-metadata.workspace = true
+anni-metadata = { workspace = true, features = ["annim"] }
 clap-handler = { version = "0.1.1", features = ["async"] }
 
 i18n-embed = { version = "0.14.1", features = [

flake.lock

@@ -0,0 +1,84 @@
+{
+  description = "A Nix-flake-based Rust development environment";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    rust-overlay = {
+      url = "github:oxalica/rust-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+  };
+
+  outputs =
+    {
+      self,
+      nixpkgs,
+      rust-overlay,
+    }:
+    let
+      supportedSystems = [
+        "x86_64-linux"
+        "aarch64-linux"
+        "x86_64-darwin"
+        "aarch64-darwin"
+      ];
+      forEachSupportedSystem =
+        f:
+        nixpkgs.lib.genAttrs supportedSystems (
+          system:
+          f {
+            pkgs = import nixpkgs {
+              inherit system;
+              overlays = [
+                rust-overlay.overlays.default
+                self.overlays.default
+              ];
+            };
+          }
+        );
+    in
+    {
+      overlays.default = final: prev: {
+        rustToolchain =
+          let
+            rust = prev.rust-bin;
+          in
+          if builtins.pathExists ./rust-toolchain.toml then
+            rust.fromRustupToolchainFile ./rust-toolchain.toml
+          else if builtins.pathExists ./rust-toolchain then
+            rust.fromRustupToolchainFile ./rust-toolchain
+          else
+            rust.stable.latest.default.override {
+              extensions = [
+                "rust-src"
+                "rustfmt"
+              ];
+            };
+      };
+
+      devShells = forEachSupportedSystem (
+        { pkgs }:
+        {
+          default = pkgs.mkShell {
+            packages = with pkgs; [
+              rustToolchain
+              openssl
+              pkg-config
+              cargo-deny
+              cargo-edit
+              cargo-watch
+              rust-analyzer
+              cmake
+              alsa-lib
+              alsa-lib.dev
+            ];
+
+            env = {
+              # Required by rust-analyzer
+              RUST_SRC_PATH = "${pkgs.rustToolchain}/lib/rustlib/src/rust/library";
+            };
+          };
+        }
+      );
+    };
+}