Upgrade strum to v0.26 (#22633)

This PR upgrades `strum` to v0.26.

Supersedes #21896.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2025-01-03 17:23:06 -05:00 committed by GitHub
parent 4bd5f0d355
commit 04cf19d49a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 25 additions and 31 deletions

50
Cargo.lock generated
View file

@ -245,7 +245,7 @@ dependencies = [
"schemars", "schemars",
"serde", "serde",
"serde_json", "serde_json",
"strum 0.25.0", "strum",
"thiserror 1.0.69", "thiserror 1.0.69",
"util", "util",
] ]
@ -435,7 +435,7 @@ dependencies = [
"similar", "similar",
"smallvec", "smallvec",
"smol", "smol",
"strum 0.25.0", "strum",
"telemetry_events", "telemetry_events",
"terminal", "terminal",
"terminal_view", "terminal_view",
@ -2715,7 +2715,7 @@ dependencies = [
"settings", "settings",
"sha2", "sha2",
"sqlx", "sqlx",
"strum 0.25.0", "strum",
"subtle", "subtle",
"supermaven_api", "supermaven_api",
"telemetry_events", "telemetry_events",
@ -2993,7 +2993,7 @@ dependencies = [
"serde_json", "serde_json",
"settings", "settings",
"smol", "smol",
"strum 0.25.0", "strum",
"task", "task",
"theme", "theme",
"ui", "ui",
@ -5273,7 +5273,7 @@ dependencies = [
"schemars", "schemars",
"serde", "serde",
"serde_json", "serde_json",
"strum 0.25.0", "strum",
] ]
[[package]] [[package]]
@ -5373,7 +5373,7 @@ dependencies = [
"slotmap", "slotmap",
"smallvec", "smallvec",
"smol", "smol",
"strum 0.25.0", "strum",
"sum_tree", "sum_tree",
"taffy", "taffy",
"thiserror 1.0.69", "thiserror 1.0.69",
@ -6237,7 +6237,7 @@ dependencies = [
"paths", "paths",
"pretty_assertions", "pretty_assertions",
"serde", "serde",
"strum 0.25.0", "strum",
"util", "util",
] ]
@ -6763,7 +6763,7 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"smol", "smol",
"strum 0.25.0", "strum",
"ui", "ui",
"util", "util",
] ]
@ -6809,7 +6809,7 @@ dependencies = [
"serde_json", "serde_json",
"settings", "settings",
"smol", "smol",
"strum 0.25.0", "strum",
"telemetry_events", "telemetry_events",
"theme", "theme",
"thiserror 1.0.69", "thiserror 1.0.69",
@ -8466,7 +8466,7 @@ dependencies = [
"schemars", "schemars",
"serde", "serde",
"serde_json", "serde_json",
"strum 0.25.0", "strum",
] ]
[[package]] [[package]]
@ -10880,7 +10880,7 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"sha2", "sha2",
"strum 0.25.0", "strum",
"tracing", "tracing",
"util", "util",
"zstd", "zstd",
@ -11302,7 +11302,7 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"sqlx", "sqlx",
"strum 0.26.3", "strum",
"thiserror 1.0.69", "thiserror 1.0.69",
"time", "time",
"tracing", "tracing",
@ -12358,7 +12358,7 @@ dependencies = [
"settings", "settings",
"simplelog", "simplelog",
"story", "story",
"strum 0.25.0", "strum",
"theme", "theme",
"title_bar", "title_bar",
"ui", "ui",
@ -12418,26 +12418,20 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
[[package]] [[package]]
name = "strum" name = "strum"
version = "0.25.0" version = "0.26.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
dependencies = [ dependencies = [
"strum_macros", "strum_macros",
] ]
[[package]]
name = "strum"
version = "0.26.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
[[package]] [[package]]
name = "strum_macros" name = "strum_macros"
version = "0.25.3" version = "0.26.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
dependencies = [ dependencies = [
"heck 0.4.1", "heck 0.5.0",
"proc-macro2", "proc-macro2",
"quote", "quote",
"rustversion", "rustversion",
@ -13025,7 +13019,7 @@ dependencies = [
"serde_json_lenient", "serde_json_lenient",
"serde_repr", "serde_repr",
"settings", "settings",
"strum 0.25.0", "strum",
"util", "util",
"uuid", "uuid",
] ]
@ -13057,7 +13051,7 @@ dependencies = [
"serde_json", "serde_json",
"serde_json_lenient", "serde_json_lenient",
"simplelog", "simplelog",
"strum 0.25.0", "strum",
"theme", "theme",
"vscode_theme", "vscode_theme",
] ]
@ -13988,7 +13982,7 @@ dependencies = [
"settings", "settings",
"smallvec", "smallvec",
"story", "story",
"strum 0.25.0", "strum",
"theme", "theme",
"ui_macros", "ui_macros",
"windows 0.58.0", "windows 0.58.0",
@ -15808,7 +15802,7 @@ dependencies = [
"settings", "settings",
"smallvec", "smallvec",
"sqlez", "sqlez",
"strum 0.25.0", "strum",
"task", "task",
"tempfile", "tempfile",
"theme", "theme",

View file

@ -463,7 +463,7 @@ smallvec = { version = "1.6", features = ["union"] }
smol = "1.2" smol = "1.2"
sqlformat = "0.2" sqlformat = "0.2"
strsim = "0.11" strsim = "0.11"
strum = { version = "0.25.0", features = ["derive"] } strum = { version = "0.26.0", features = ["derive"] }
subtle = "2.5.0" subtle = "2.5.0"
sys-locale = "0.3.1" sys-locale = "0.3.1"
sysinfo = "0.31.0" sysinfo = "0.31.0"

View file

@ -1,7 +1,7 @@
use crate::proto; use crate::proto;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_json::{map, Value}; use serde_json::{map, Value};
use strum::{EnumVariantNames, VariantNames as _}; use strum::VariantNames;
const KIND: &str = "kind"; const KIND: &str = "kind";
const ENTITY_ID: &str = "entity_id"; const ENTITY_ID: &str = "entity_id";
@ -15,7 +15,7 @@ const ENTITY_ID: &str = "entity_id";
/// Most notification types have a special field which is aliased to /// Most notification types have a special field which is aliased to
/// `entity_id`. This field is stored in its own database column, and can /// `entity_id`. This field is stored in its own database column, and can
/// be used to query the notification. /// be used to query the notification.
#[derive(Debug, Clone, PartialEq, Eq, EnumVariantNames, Serialize, Deserialize)] #[derive(Debug, Clone, PartialEq, Eq, VariantNames, Serialize, Deserialize)]
#[serde(tag = "kind")] #[serde(tag = "kind")]
pub enum Notification { pub enum Notification {
ContactRequest { ContactRequest {