pangocairo: Rename Font / FontMap traits to avoid conflicts with pango

Author: sdroege

pangocairo/Gir.toml

@@ -10,9 +10,7 @@ single_version_file = true
 deprecate_by_min_version = true
 trust_return_value_nullability = true
 
-generate = [
-    "PangoCairo.Font",
-]
+generate = []
 
 manual = [
     "cairo.Context",
@@ -101,15 +99,21 @@ status = "generate"
     name = "cr"
     const = true
 
+[[object]]
+name = "PangoCairo.Font"
+status = "generate"
+trait_name = "PangoCairoFontExt"
+
 [[object]]
 name = "PangoCairo.FontMap"
 status = "generate"
-manual_traits = ["FontMapExtManual"]
+trait_name = "PangoCairoFontMapExt"
+manual_traits = ["PangoCairoFontMapExtManual"]
     [[object.function]]
     # Needed because cairo types don't implement `.into_glib()`.
     name = "get_font_type"
     manual = true
-    doc_trait_name = "FontMapExtManual"
+    doc_trait_name = "PangoCairoFontMapExtManual"
     [[object.function]]
     # Needed because cairo types don't implement `.into_glib()`.
     name = "new_for_font_type"

pangocairo/src/auto/font.rs

@@ -18,7 +18,7 @@ impl Font {
     pub const NONE: Option<&'static Font> = None;
 }
 
-pub trait FontExt: IsA<Font> + 'static {
+pub trait PangoCairoFontExt: IsA<Font> + 'static {
     #[doc(alias = "pango_cairo_font_get_scaled_font")]
     #[doc(alias = "get_scaled_font")]
     fn scaled_font(&self) -> Option<cairo::ScaledFont> {
@@ -30,7 +30,7 @@ pub trait FontExt: IsA<Font> + 'static {
     }
 }
 
-impl<O: IsA<Font>> FontExt for O {}
+impl<O: IsA<Font>> PangoCairoFontExt for O {}
 
 impl fmt::Display for Font {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {

pangocairo/src/auto/font_map.rs

@@ -25,7 +25,7 @@ impl FontMap {
     }
 }
 
-pub trait FontMapExt: IsA<FontMap> + 'static {
+pub trait PangoCairoFontMapExt: IsA<FontMap> + 'static {
     #[doc(alias = "pango_cairo_font_map_get_resolution")]
     #[doc(alias = "get_resolution")]
     fn resolution(&self) -> f64 {
@@ -40,7 +40,7 @@ pub trait FontMapExt: IsA<FontMap> + 'static {
     }
 }
 
-impl<O: IsA<FontMap>> FontMapExt for O {}
+impl<O: IsA<FontMap>> PangoCairoFontMapExt for O {}
 
 impl fmt::Display for FontMap {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {

pangocairo/src/auto/mod.rs

@@ -12,6 +12,6 @@ pub mod functions;
 
 #[doc(hidden)]
 pub mod traits {
-    pub use super::font::FontExt;
-    pub use super::font_map::FontMapExt;
+    pub use super::font::PangoCairoFontExt;
+    pub use super::font_map::PangoCairoFontMapExt;
 }

pangocairo/src/font_map.rs

@@ -4,15 +4,15 @@ use glib::{prelude::*, translate::*};
 
 use crate::FontMap;
 
-pub trait FontMapExtManual: IsA<FontMap> + 'static {
+pub trait PangoCairoFontMapExtManual: IsA<FontMap> + 'static {
     #[doc(alias = "pango_cairo_font_map_get_font_type")]
     #[doc(alias = "get_font_type")]
     fn font_type(&self) -> cairo::FontType {
         unsafe { ffi::pango_cairo_font_map_get_font_type(self.as_ref().to_glib_none().0).into() }
     }
 }
 
-impl<O: IsA<FontMap>> FontMapExtManual for O {}
+impl<O: IsA<FontMap>> PangoCairoFontMapExtManual for O {}
 
 impl FontMap {
     #[doc(alias = "pango_cairo_font_map_new_for_font_type")]

pangocairo/src/prelude.rs

@@ -5,4 +5,4 @@ pub use glib::prelude::*;
 #[doc(hidden)]
 pub use pango::prelude::*;
 
-pub use crate::{auto::traits::*, font_map::FontMapExtManual};
+pub use crate::{auto::traits::*, font_map::PangoCairoFontMapExtManual};