Bump rust version to 2024

saecki · saecki · commit abdcbb6b87f1 · 2026-04-17T15:00:11.000+02:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "typst-package-check"
 version = "0.4.5"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 casbab = "0.1.1"
diff --git a/src/action.rs b/src/action.rs
@@ -1,8 +1,9 @@
 use crate::{
     check::TryExt,
     github::{
-        api::{pr::PullRequestEvent, GitHubAuth, Installation, Repository},
-        run_github_check, AppState,
+        AppState,
+        api::{GitHubAuth, Installation, Repository, pr::PullRequestEvent},
+        run_github_check,
     },
 };
 
diff --git a/src/check.rs b/src/check.rs
@@ -2,8 +2,8 @@ use std::path::PathBuf;
 
 use codespan_reporting::diagnostic::Label;
 use typst::{
-    syntax::{package::PackageSpec, FileId, Span},
     WorldExt,
+    syntax::{FileId, Span, package::PackageSpec},
 };
 
 use crate::world::SystemWorld;
diff --git a/src/check/authors.rs b/src/check/authors.rs
@@ -1,5 +1,5 @@
 use codespan_reporting::diagnostic::{Diagnostic, Label};
-use typst::syntax::{package::PackageSpec, FileId, VirtualPath};
+use typst::syntax::{FileId, VirtualPath, package::PackageSpec};
 
 use crate::{github::git, package::PackageExt};
 
diff --git a/src/check/compile.rs b/src/check/compile.rs
@@ -7,7 +7,7 @@ use typst::{
 
 use crate::world::SystemWorld;
 
-use super::{label, Diagnostics};
+use super::{Diagnostics, label};
 
 pub fn check(diags: &mut Diagnostics, world: &SystemWorld) -> Option<PagedDocument> {
     let result = typst::compile(world);
diff --git a/src/check/files.rs b/src/check/files.rs
@@ -4,10 +4,10 @@ use std::path::Path;
 use codespan_reporting::diagnostic::{Diagnostic, Label};
 use walkdir::WalkDir;
 
+use crate::check::Diagnostics;
 use crate::check::manifest::Manifest;
 use crate::check::path::PackagePath;
 use crate::check::readme::Readme;
-use crate::check::Diagnostics;
 
 pub fn check(
     diags: &mut Diagnostics,
@@ -218,13 +218,15 @@ fn link_manuals(
         let note = (!excluded)
             .then(|| "It should also be added to `exclude` in your `typst.toml`.".into());
 
-        diags.emit(Diagnostic::warning()
-            .with_label(Label::primary(path.file_id(), 0..0))
-            .with_code("files/manual/unlinked")
-            .with_message(
-                "This file seems to be a manual/documentation, but isn't linked in the readme. \
+        diags.emit(
+            Diagnostic::warning()
+                .with_label(Label::primary(path.file_id(), 0..0))
+                .with_code("files/manual/unlinked")
+                .with_message(
+                    "This file seems to be a manual/documentation, but isn't linked in the readme. \
                  It will be inacessible on Typst Universe.",
-            )
-            .with_notes_iter(note));
+                )
+                .with_notes_iter(note),
+        );
     }
 }
diff --git a/src/check/imports.rs b/src/check/imports.rs
@@ -5,16 +5,16 @@ use std::{
 
 use codespan_reporting::diagnostic::Diagnostic;
 use typst::{
+    World,
     syntax::{
         ast::{self, AstNode, ModuleImport},
         package::{PackageSpec, PackageVersion, VersionlessPackageSpec},
     },
-    World,
 };
 use walkdir::WalkDir;
 
 use crate::check::path::PackagePath;
-use crate::check::{label, Diagnostics, Result, TryExt};
+use crate::check::{Diagnostics, Result, TryExt, label};
 use crate::world::SystemWorld;
 
 pub fn check(diags: &mut Diagnostics, package_dir: &Path, world: &SystemWorld) -> Result<()> {
@@ -85,23 +85,18 @@ pub fn check_ast(
             )
         }
 
-        if let Some(all_packages) = all_packages {
-            if let Ok(import_spec) = PackageSpec::from_str(source_str.get().as_str()) {
-                if let Some(latest_version) =
-                    latest_package_version(all_packages, import_spec.versionless())
-                {
-                    if latest_version != import_spec.version {
-                        diags.emit(
-                            Diagnostic::warning()
-                                .with_labels(label(world, import.span()).into_iter().collect())
-                                .with_code("import/outdated")
-                                .with_message(
-                                    "This import seems to use an older version of the package.",
-                                ),
-                        )
-                    }
-                }
-            }
+        if let Some(all_packages) = all_packages
+            && let Ok(import_spec) = PackageSpec::from_str(source_str.get().as_str())
+            && let Some(latest_version) =
+                latest_package_version(all_packages, import_spec.versionless())
+            && latest_version != import_spec.version
+        {
+            diags.emit(
+                Diagnostic::warning()
+                    .with_labels(label(world, import.span()).into_iter().collect())
+                    .with_code("import/outdated")
+                    .with_message("This import seems to use an older version of the package."),
+            )
         }
     }
 }
diff --git a/src/check/kebab_case.rs b/src/check/kebab_case.rs
@@ -3,17 +3,17 @@ use std::collections::HashSet;
 use codespan_reporting::diagnostic::{Diagnostic, Severity};
 use comemo::Track;
 use typst::{
+    ROUTINES, World,
     engine::{Route, Sink, Traced},
     syntax::{
-        ast::{self, AstNode},
         FileId, Source, SyntaxNode,
+        ast::{self, AstNode},
     },
-    World, ROUTINES,
 };
 
 use crate::world::SystemWorld;
 
-use super::{label, Diagnostics};
+use super::{Diagnostics, label};
 
 // Check that all public identifiers are in kebab-case
 pub fn check(diags: &mut Diagnostics, world: &SystemWorld) -> Option<()> {
diff --git a/src/check/manifest.rs b/src/check/manifest.rs
@@ -7,8 +7,8 @@ use reqwest::StatusCode;
 use toml_edit::{Array, Item, Table};
 use tracing::{debug, warn};
 use typst::syntax::{
-    package::{PackageSpec, PackageVersion},
     FileId, VirtualPath,
+    package::{PackageSpec, PackageVersion},
 };
 use walkdir::WalkDir;
 
@@ -178,20 +178,20 @@ fn check_name(
         );
     }
 
-    if let Some(package_spec) = package_spec {
-        if name.val != package_spec.name {
-            diags.emit(
-                error
-                    .with_code("manifest/package/name/mismatch")
-                    .with_message(format!(
-                        "Unexpected package name. `{name}` was expected. \
+    if let Some(package_spec) = package_spec
+        && name.val != package_spec.name
+    {
+        diags.emit(
+            error
+                .with_code("manifest/package/name/mismatch")
+                .with_message(format!(
+                    "Unexpected package name. `{name}` was expected. \
                         If you want to publish a new package, create a new \
                         directory in `packages/{namespace}/`.",
-                        name = package_spec.name,
-                        namespace = package_spec.namespace,
-                    )),
-            )
-        }
+                    name = package_spec.name,
+                    namespace = package_spec.namespace,
+                )),
+        )
     }
 
     Some(name.to_owned())
@@ -239,21 +239,21 @@ fn check_version(
         return None;
     };
 
-    if let Some(package_spec) = package_spec {
-        if version.val != package_spec.version {
-            diags.emit(
-                error
-                    .with_code("manifest/package/version/mismatch")
-                    .with_message(format!(
-                        "Unexpected version number. `{version}` was expected. \
+    if let Some(package_spec) = package_spec
+        && version.val != package_spec.version
+    {
+        diags.emit(
+            error
+                .with_code("manifest/package/version/mismatch")
+                .with_message(format!(
+                    "Unexpected version number. `{version}` was expected. \
                         If you want to publish a new version, create a new \
                         directory in `packages/{namespace}/{name}`.",
-                        version = package_spec.version,
-                        name = package_spec.name,
-                        namespace = package_spec.namespace,
-                    )),
-            )
-        }
+                    version = package_spec.version,
+                    name = package_spec.name,
+                    namespace = package_spec.namespace,
+                )),
+        )
     }
 
     Some(version)
@@ -684,20 +684,20 @@ fn check_thumbnail(diags: &mut Diagnostics, exclude: &Override, template: &Spann
         );
     }
 
-    if let Some(template_path) = &template.path {
-        if thumbnail_path.full().starts_with(template_path.full()) {
-            diags.emit(
-                Diagnostic::error()
-                    .with_label(Label::primary(manifest_id(), thumbnail_path.span()))
-                    .with_code("manifest/template/thumbnail/location")
-                    .with_message(
-                        "The thumbnail file should be outside of the template directory.\n\n\
+    if let Some(template_path) = &template.path
+        && thumbnail_path.full().starts_with(template_path.full())
+    {
+        diags.emit(
+            Diagnostic::error()
+                .with_label(Label::primary(manifest_id(), thumbnail_path.span()))
+                .with_code("manifest/template/thumbnail/location")
+                .with_message(
+                    "The thumbnail file should be outside of the template directory.\n\n\
                         When your template will be used as a base for users's projects, \
                         the template directory will be copied as is, and the thumbnail file
                         is generally not displayed in documents based on your template.",
-                    ),
-            );
-        }
+                ),
+        );
     }
 }
 
diff --git a/src/check/readme.rs b/src/check/readme.rs
@@ -7,15 +7,15 @@ use comrak::nodes::{LineColumn, NodeList, NodeValue as MdNode, Sourcepos};
 use html5ever::tendril::TendrilSink;
 use regex::Regex;
 use typst::{
+    World,
     foundations::Bytes,
     syntax::{FileId, VirtualPath},
-    World,
 };
 use url::Url;
 
 use crate::check::path::PackagePath;
 use crate::{
-    check::{imports, kebab_case, label, Diagnostics, TryExt},
+    check::{Diagnostics, TryExt, imports, kebab_case, label},
     world::SystemWorld,
 };
 
diff --git a/src/cli.rs b/src/cli.rs
@@ -4,7 +4,7 @@ use std::process::exit;
 use codespan_reporting::{diagnostic::Diagnostic, term};
 use ignore::overrides::Override;
 use tracing::error;
-use typst::syntax::{package::PackageSpec, FileId, Source};
+use typst::syntax::{FileId, Source, package::PackageSpec};
 
 use crate::{check::all_checks, package::PackageExt, world::SystemWorld};
 
diff --git a/src/github.rs b/src/github.rs
@@ -10,7 +10,7 @@ use codespan_reporting::{
 use jwt_simple::prelude::*;
 use pr::{PullRequest, PullRequestUpdate};
 use tracing::{debug, warn};
-use typst::syntax::{package::PackageSpec, FileId};
+use typst::syntax::{FileId, package::PackageSpec};
 
 use crate::{
     check::{self, Result, TryExt},
@@ -158,22 +158,22 @@ pub async fn run_github_check(
             expected_pr_title, labels
         );
         // Actually update the PR, if needed
-        if let Some(expected_pr_title) = expected_pr_title {
-            if pr.title != expected_pr_title || !labels.is_empty() || body.is_some() {
-                api_client
-                    .update_pull_request(
-                        repository.owner(),
-                        repository.name(),
-                        pr.number,
-                        PullRequestUpdate {
-                            title: expected_pr_title,
-                            labels,
-                            body,
-                        },
-                    )
-                    .await
-                    .error("github/api/pull/update", "Failed to update pull request")?;
-            }
+        if let Some(expected_pr_title) = expected_pr_title
+            && (pr.title != expected_pr_title || !labels.is_empty() || body.is_some())
+        {
+            api_client
+                .update_pull_request(
+                    repository.owner(),
+                    repository.name(),
+                    pr.number,
+                    PullRequestUpdate {
+                        title: expected_pr_title,
+                        labels,
+                        body,
+                    },
+                )
+                .await
+                .error("github/api/pull/update", "Failed to update pull request")?;
         }
     }
 
@@ -238,7 +238,7 @@ pub async fn run_github_check(
                         previous_pr.number, previous_pr.user.login
                     );
                     if previous_pr.user.login != current_pr.user.login {
-                        if let Err(e) = api_client
+                        let res = api_client
                             .post_pr_comment(
                                 repository.owner(),
                                 repository.name(),
@@ -252,15 +252,19 @@ pub async fn run_github_check(
                                     will not be merged.",
                                     previous_pr.user.login,
                                     package.name,
-                                    package.previous_version()
-                                        .expect("If there is no previous version, this branch should not be reached")
+                                    package
+                                        .previous_version()
+                                        .expect(
+                                            "If there is no previous version, \
+                                            this branch should not be reached"
+                                        )
                                         .version
                                 ),
                             )
-                            .await
-                            {
-                                warn!("Error while posting PR comment: {:?}", e)
-                            }
+                            .await;
+                        if let Err(e) = res {
+                            warn!("Error while posting PR comment: {:?}", e)
+                        }
                     }
                 }
             }
@@ -405,11 +409,7 @@ fn update_description_checks(
         })
         .unwrap_or_default();
 
-    if body_changed {
-        Some(new_body)
-    } else {
-        None
-    }
+    body_changed.then_some(new_body)
 }
 
 fn diagnostic_to_annotation(
diff --git a/src/github/api/pr.rs b/src/github/api/pr.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use super::{user::User, ApiError, AuthInstallation, GitHub, JsonExt, OwnerId, RepoId};
+use super::{ApiError, AuthInstallation, GitHub, JsonExt, OwnerId, RepoId, user::User};
 
 #[derive(Deserialize)]
 pub struct PullRequestEvent {
diff --git a/src/world.rs b/src/world.rs
