From 28aa3385c4d650d4ef8f7c41f77d6ce2948ced79 Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Sun, 4 Dec 2022 21:28:56 +0100 Subject: [PATCH] pango: Manually implement Language::to_string To avoid an API break for 0.16 --- pango/Gir.toml | 3 +++ pango/src/auto/language.rs | 10 ---------- pango/src/language.rs | 10 +++++++++- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/pango/Gir.toml b/pango/Gir.toml index 0dfc1dfa6eeb..1c60925e9da2 100644 --- a/pango/Gir.toml +++ b/pango/Gir.toml @@ -350,6 +350,9 @@ status = "generate" nullable = false [object.function.return] nullable = false + [[object.function]] + name = "to_string" + manual = true # avoids renaming the function to not cause an API break [[object]] name = "Pango.Layout" diff --git a/pango/src/auto/language.rs b/pango/src/auto/language.rs index 040cbca28318..982ded9722ea 100644 --- a/pango/src/auto/language.rs +++ b/pango/src/auto/language.rs @@ -48,16 +48,6 @@ impl Language { } } - #[doc(alias = "pango_language_to_string")] - #[doc(alias = "to_string")] - pub fn to_str(&self) -> glib::GString { - unsafe { - from_glib_none(ffi::pango_language_to_string(mut_override( - self.to_glib_none().0, - ))) - } - } - #[doc(alias = "pango_language_from_string")] pub fn from_string(language: &str) -> Language { unsafe { from_glib_none(ffi::pango_language_from_string(language.to_glib_none().0)) } diff --git a/pango/src/language.rs b/pango/src/language.rs index 132a8b83045c..c96e75fff556 100644 --- a/pango/src/language.rs +++ b/pango/src/language.rs @@ -41,11 +41,19 @@ impl Language { Self::from_glib_full_as_vec(ptr) } } + + #[doc(alias = "pango_language_to_string")] + pub fn to_string(&self) -> glib::GString { + unsafe { + from_glib_none(ffi::pango_language_to_string(mut_override( + self.to_glib_none().0, + ))) + } + } } impl FromStr for Language { type Err = std::convert::Infallible; - fn from_str(language: &str) -> Result { Ok(Self::from_string(language)) }