From 54046916d08986a90c44d8625616a109e8e91848 Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Fri, 29 Dec 2023 13:11:12 +0100 Subject: [PATCH] Revert to bitflags 1.0.4 to not break semver This makes $ cargo public-api diff 5.1.0 report no changes: Removed items from the public API ================================= (none) Changed items in the public API =============================== (none) Added items to the public API ============================= (none) --- Cargo.toml | 2 +- src/highlighting/style.rs | 2 +- tests/public-api.txt | 25 ++++++------------------- 3 files changed, 8 insertions(+), 21 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ac6654f..3276f6c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ onig = { version = "6.0", optional = true, default-features = false } fancy-regex = { version = "0.11", optional = true } walkdir = "2.0" regex-syntax = { version = "0.8", optional = true } -bitflags = {version = "2.4", features = ["serde"] } +bitflags = "1.0.4" plist = { version = "1.3", optional = true } bincode = { version = "1.0", optional = true } flate2 = { version = "1.0", optional = true } diff --git a/src/highlighting/style.rs b/src/highlighting/style.rs index 6f756cf..43736aa 100644 --- a/src/highlighting/style.rs +++ b/src/highlighting/style.rs @@ -68,7 +68,7 @@ impl std::fmt::Debug for Color { bitflags! { /// The color-independent styling of a font - i.e. bold, italicized, and/or underlined - #[derive(Serialize, Deserialize, Debug, Hash, Eq, PartialEq, Clone, Copy)] + #[derive(Serialize, Deserialize)] pub struct FontStyle: u8 { /// Bold font style const BOLD = 1; diff --git a/tests/public-api.txt b/tests/public-api.txt index 842fa2e..3a40ce2 100644 --- a/tests/public-api.txt +++ b/tests/public-api.txt @@ -159,12 +159,11 @@ impl core::marker::Sync for syntect::highlighting::Color impl core::marker::Unpin for syntect::highlighting::Color impl core::panic::unwind_safe::RefUnwindSafe for syntect::highlighting::Color impl core::panic::unwind_safe::UnwindSafe for syntect::highlighting::Color -pub struct syntect::highlighting::FontStyle(_) +pub struct syntect::highlighting::FontStyle impl syntect::highlighting::FontStyle pub const syntect::highlighting::FontStyle::BOLD: Self pub const syntect::highlighting::FontStyle::ITALIC: Self pub const syntect::highlighting::FontStyle::UNDERLINE: Self -impl syntect::highlighting::FontStyle pub const fn syntect::highlighting::FontStyle::all() -> Self pub const fn syntect::highlighting::FontStyle::bits(&self) -> u8 pub const fn syntect::highlighting::FontStyle::complement(self) -> Self @@ -172,9 +171,8 @@ pub const fn syntect::highlighting::FontStyle::contains(&self, other: Self) -> b pub const fn syntect::highlighting::FontStyle::difference(self, other: Self) -> Self pub const fn syntect::highlighting::FontStyle::empty() -> Self pub const fn syntect::highlighting::FontStyle::from_bits(bits: u8) -> core::option::Option -pub const fn syntect::highlighting::FontStyle::from_bits_retain(bits: u8) -> Self pub const fn syntect::highlighting::FontStyle::from_bits_truncate(bits: u8) -> Self -pub fn syntect::highlighting::FontStyle::from_name(name: &str) -> core::option::Option +pub unsafe const fn syntect::highlighting::FontStyle::from_bits_unchecked(bits: u8) -> Self pub fn syntect::highlighting::FontStyle::insert(&mut self, other: Self) pub const fn syntect::highlighting::FontStyle::intersection(self, other: Self) -> Self pub const fn syntect::highlighting::FontStyle::intersects(&self, other: Self) -> bool @@ -185,22 +183,15 @@ pub fn syntect::highlighting::FontStyle::set(&mut self, other: Self, value: bool pub const fn syntect::highlighting::FontStyle::symmetric_difference(self, other: Self) -> Self pub fn syntect::highlighting::FontStyle::toggle(&mut self, other: Self) pub const fn syntect::highlighting::FontStyle::union(self, other: Self) -> Self -impl syntect::highlighting::FontStyle -pub const fn syntect::highlighting::FontStyle::iter(&self) -> bitflags::iter::Iter -pub const fn syntect::highlighting::FontStyle::iter_names(&self) -> bitflags::iter::IterNames -impl bitflags::traits::Flags for syntect::highlighting::FontStyle -pub type syntect::highlighting::FontStyle::Bits = u8 -pub const syntect::highlighting::FontStyle::FLAGS: &'static [bitflags::traits::Flag] -pub fn syntect::highlighting::FontStyle::bits(&self) -> u8 -pub fn syntect::highlighting::FontStyle::from_bits_retain(bits: u8) -> syntect::highlighting::FontStyle -impl bitflags::traits::PublicFlags for syntect::highlighting::FontStyle -pub type syntect::highlighting::FontStyle::Internal = InternalBitFlags -pub type syntect::highlighting::FontStyle::Primitive = u8 impl core::clone::Clone for syntect::highlighting::FontStyle pub fn syntect::highlighting::FontStyle::clone(&self) -> syntect::highlighting::FontStyle impl core::cmp::Eq for syntect::highlighting::FontStyle +impl core::cmp::Ord for syntect::highlighting::FontStyle +pub fn syntect::highlighting::FontStyle::cmp(&self, other: &syntect::highlighting::FontStyle) -> core::cmp::Ordering impl core::cmp::PartialEq for syntect::highlighting::FontStyle pub fn syntect::highlighting::FontStyle::eq(&self, other: &syntect::highlighting::FontStyle) -> bool +impl core::cmp::PartialOrd for syntect::highlighting::FontStyle +pub fn syntect::highlighting::FontStyle::partial_cmp(&self, other: &syntect::highlighting::FontStyle) -> core::option::Option impl core::default::Default for syntect::highlighting::FontStyle pub fn syntect::highlighting::FontStyle::default() -> syntect::highlighting::FontStyle impl core::fmt::Binary for syntect::highlighting::FontStyle @@ -219,10 +210,6 @@ impl core::iter::traits::collect::Extend for s pub fn syntect::highlighting::FontStyle::extend>(&mut self, iterator: T) impl core::iter::traits::collect::FromIterator for syntect::highlighting::FontStyle pub fn syntect::highlighting::FontStyle::from_iter>(iterator: T) -> Self -impl core::iter::traits::collect::IntoIterator for syntect::highlighting::FontStyle -pub type syntect::highlighting::FontStyle::IntoIter = bitflags::iter::Iter -pub type syntect::highlighting::FontStyle::Item = syntect::highlighting::FontStyle -pub fn syntect::highlighting::FontStyle::into_iter(self) -> Self::IntoIter impl core::marker::Copy for syntect::highlighting::FontStyle impl core::marker::StructuralEq for syntect::highlighting::FontStyle impl core::marker::StructuralPartialEq for syntect::highlighting::FontStyle