diff options
| author | D. Scott Boggs <scott@tams.tech> | 2024-04-08 10:08:10 -0400 |
|---|---|---|
| committer | D. Scott Boggs <scott@tams.tech> | 2024-04-08 10:08:10 -0400 |
| commit | aa38f1808c8433c94dd08aac2d8d502de7ef8211 (patch) | |
| tree | fea988cb12ea5555075c7eb7063e1f0b36538344 | |
| parent | c6ae9168bfff314a5edec3b5f3ecaf5ce40784c8 (diff) | |
Fix changes missing after rebase
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | entities/src/account.rs | 2 | ||||
| -rw-r--r-- | entities/src/admin/canonical_email_block.rs | 3 |
3 files changed, 3 insertions, 4 deletions
@@ -11,7 +11,7 @@ version = "1.3.2" license = "MIT/Apache-2.0" authors = ["Aaron Power <theaaronepower@gmail.com>", "Paul Woolcock <paul@woolcock.us>", "D. Scott Boggs <scott@tams.tech>"] edition = "2021" -rust-version = "1.67" +rust-version = "1.70" [package] name = "mastodon-async" diff --git a/entities/src/account.rs b/entities/src/account.rs index 45374af..2a0e538 100644 --- a/entities/src/account.rs +++ b/entities/src/account.rs @@ -487,7 +487,7 @@ pub enum RolePermissions { mod fields_attributes_ser { use super::*; use serde::ser::{SerializeMap, Serializer}; - pub fn ser<S>(attrs: &Vec<MetadataField>, serializer: S) -> Result<S::Ok, S::Error> + pub fn ser<S>(attrs: &[MetadataField], serializer: S) -> Result<S::Ok, S::Error> where S: Serializer, { diff --git a/entities/src/admin/canonical_email_block.rs b/entities/src/admin/canonical_email_block.rs index ece40e3..b79d0b5 100644 --- a/entities/src/admin/canonical_email_block.rs +++ b/entities/src/admin/canonical_email_block.rs @@ -15,8 +15,7 @@ pub struct CanonicalEmailBlock { impl PartialOrd for CanonicalEmailBlock { fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> { - self.canonical_email_hash - .partial_cmp(&other.canonical_email_hash) + Some(self.cmp(other)) } } impl Ord for CanonicalEmailBlock { |