Skip to content

Commit b49ac88

Browse files
Regenerate with latest gir-files
1 parent fe89a17 commit b49ac88

File tree

15 files changed

+29
-123
lines changed

15 files changed

+29
-123
lines changed

gdk-pixbuf/src/auto/versions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
Generated by gir (https://github.com/gtk-rs/gir @ 0f2c059e0939)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 615ef8fb32f2)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 326eb5f2d5d8)

gdk-pixbuf/sys/versions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
Generated by gir (https://github.com/gtk-rs/gir @ 0f2c059e0939)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 615ef8fb32f2)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 326eb5f2d5d8)

gio/src/auto/versions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
Generated by gir (https://github.com/gtk-rs/gir @ 0f2c059e0939)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 615ef8fb32f2)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 326eb5f2d5d8)

gio/sys/versions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
Generated by gir (https://github.com/gtk-rs/gir @ 0f2c059e0939)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 615ef8fb32f2)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 326eb5f2d5d8)

glib/gobject-sys/versions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
Generated by gir (https://github.com/gtk-rs/gir @ 0f2c059e0939)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 615ef8fb32f2)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 326eb5f2d5d8)

glib/src/auto/enums.rs

Lines changed: 0 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -908,61 +908,6 @@ pub enum UnicodeBreakType {
908908
__Unknown(i32),
909909
}
910910

911-
impl fmt::Display for UnicodeBreakType {
912-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
913-
write!(
914-
f,
915-
"UnicodeBreakType::{}",
916-
match *self {
917-
Self::Mandatory => "Mandatory",
918-
Self::CarriageReturn => "CarriageReturn",
919-
Self::LineFeed => "LineFeed",
920-
Self::CombiningMark => "CombiningMark",
921-
Self::Surrogate => "Surrogate",
922-
Self::ZeroWidthSpace => "ZeroWidthSpace",
923-
Self::Inseparable => "Inseparable",
924-
Self::NonBreakingGlue => "NonBreakingGlue",
925-
Self::Contingent => "Contingent",
926-
Self::Space => "Space",
927-
Self::After => "After",
928-
Self::Before => "Before",
929-
Self::BeforeAndAfter => "BeforeAndAfter",
930-
Self::Hyphen => "Hyphen",
931-
Self::NonStarter => "NonStarter",
932-
Self::OpenPunctuation => "OpenPunctuation",
933-
Self::ClosePunctuation => "ClosePunctuation",
934-
Self::Quotation => "Quotation",
935-
Self::Exclamation => "Exclamation",
936-
Self::Ideographic => "Ideographic",
937-
Self::Numeric => "Numeric",
938-
Self::InfixSeparator => "InfixSeparator",
939-
Self::Symbol => "Symbol",
940-
Self::Alphabetic => "Alphabetic",
941-
Self::Prefix => "Prefix",
942-
Self::Postfix => "Postfix",
943-
Self::ComplexContext => "ComplexContext",
944-
Self::Ambiguous => "Ambiguous",
945-
Self::Unknown => "Unknown",
946-
Self::NextLine => "NextLine",
947-
Self::WordJoiner => "WordJoiner",
948-
Self::HangulLJamo => "HangulLJamo",
949-
Self::HangulVJamo => "HangulVJamo",
950-
Self::HangulTJamo => "HangulTJamo",
951-
Self::HangulLvSyllable => "HangulLvSyllable",
952-
Self::HangulLvtSyllable => "HangulLvtSyllable",
953-
Self::CloseParenthesis => "CloseParenthesis",
954-
Self::ConditionalJapaneseStarter => "ConditionalJapaneseStarter",
955-
Self::HebrewLetter => "HebrewLetter",
956-
Self::RegionalIndicator => "RegionalIndicator",
957-
Self::EmojiBase => "EmojiBase",
958-
Self::EmojiModifier => "EmojiModifier",
959-
Self::ZeroWidthJoiner => "ZeroWidthJoiner",
960-
_ => "Unknown",
961-
}
962-
)
963-
}
964-
}
965-
966911
#[doc(hidden)]
967912
impl IntoGlib for UnicodeBreakType {
968913
type GlibType = ffi::GUnicodeBreakType;
@@ -1861,48 +1806,6 @@ pub enum UnicodeType {
18611806
__Unknown(i32),
18621807
}
18631808

1864-
impl fmt::Display for UnicodeType {
1865-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
1866-
write!(
1867-
f,
1868-
"UnicodeType::{}",
1869-
match *self {
1870-
Self::Control => "Control",
1871-
Self::Format => "Format",
1872-
Self::Unassigned => "Unassigned",
1873-
Self::PrivateUse => "PrivateUse",
1874-
Self::Surrogate => "Surrogate",
1875-
Self::LowercaseLetter => "LowercaseLetter",
1876-
Self::ModifierLetter => "ModifierLetter",
1877-
Self::OtherLetter => "OtherLetter",
1878-
Self::TitlecaseLetter => "TitlecaseLetter",
1879-
Self::UppercaseLetter => "UppercaseLetter",
1880-
Self::SpacingMark => "SpacingMark",
1881-
Self::EnclosingMark => "EnclosingMark",
1882-
Self::NonSpacingMark => "NonSpacingMark",
1883-
Self::DecimalNumber => "DecimalNumber",
1884-
Self::LetterNumber => "LetterNumber",
1885-
Self::OtherNumber => "OtherNumber",
1886-
Self::ConnectPunctuation => "ConnectPunctuation",
1887-
Self::DashPunctuation => "DashPunctuation",
1888-
Self::ClosePunctuation => "ClosePunctuation",
1889-
Self::FinalPunctuation => "FinalPunctuation",
1890-
Self::InitialPunctuation => "InitialPunctuation",
1891-
Self::OtherPunctuation => "OtherPunctuation",
1892-
Self::OpenPunctuation => "OpenPunctuation",
1893-
Self::CurrencySymbol => "CurrencySymbol",
1894-
Self::ModifierSymbol => "ModifierSymbol",
1895-
Self::MathSymbol => "MathSymbol",
1896-
Self::OtherSymbol => "OtherSymbol",
1897-
Self::LineSeparator => "LineSeparator",
1898-
Self::ParagraphSeparator => "ParagraphSeparator",
1899-
Self::SpaceSeparator => "SpaceSeparator",
1900-
_ => "Unknown",
1901-
}
1902-
)
1903-
}
1904-
}
1905-
19061809
#[doc(hidden)]
19071810
impl IntoGlib for UnicodeType {
19081811
type GlibType = ffi::GUnicodeType;

glib/src/auto/functions.rs

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -701,22 +701,25 @@ pub fn spaced_primes_closest(num: u32) -> u32 {
701701
}
702702

703703
#[doc(alias = "g_spawn_async")]
704-
pub fn spawn_async<P: FnOnce() + Send + Sync + 'static>(
704+
pub fn spawn_async(
705705
working_directory: Option<impl AsRef<std::path::Path>>,
706706
argv: &[&std::path::Path],
707707
envp: &[&std::path::Path],
708708
flags: SpawnFlags,
709-
child_setup: P,
709+
child_setup: Option<Box_<dyn FnOnce() + 'static>>,
710710
) -> Result<Pid, crate::Error> {
711-
let child_setup_data: Box_<P> = Box_::new(child_setup);
712-
unsafe extern "C" fn child_setup_func<P: FnOnce() + Send + Sync + 'static>(
713-
data: ffi::gpointer,
714-
) {
715-
let callback: Box_<P> = Box_::from_raw(data as *mut _);
716-
(*callback)()
717-
}
718-
let child_setup = Some(child_setup_func::<P> as _);
719-
let super_callback0: Box_<P> = child_setup_data;
711+
let child_setup_data: Box_<Option<Box_<dyn FnOnce() + 'static>>> = Box_::new(child_setup);
712+
unsafe extern "C" fn child_setup_func(data: ffi::gpointer) {
713+
let callback: Box_<Option<Box_<dyn FnOnce() + 'static>>> = Box_::from_raw(data as *mut _);
714+
let callback = (*callback).expect("cannot get closure...");
715+
callback()
716+
}
717+
let child_setup = if child_setup_data.is_some() {
718+
Some(child_setup_func as _)
719+
} else {
720+
None
721+
};
722+
let super_callback0: Box_<Option<Box_<dyn FnOnce() + 'static>>> = child_setup_data;
720723
unsafe {
721724
let mut child_pid = std::mem::MaybeUninit::uninit();
722725
let mut error = std::ptr::null_mut();
@@ -746,7 +749,7 @@ pub fn spawn_async<P: FnOnce() + Send + Sync + 'static>(
746749
//#[cfg(feature = "v2_68")]
747750
//#[cfg_attr(docsrs, doc(cfg(feature = "v2_68")))]
748751
//#[doc(alias = "g_spawn_async_with_pipes_and_fds")]
749-
//pub fn spawn_async_with_pipes_and_fds<P: FnOnce() + Send + Sync + 'static>(working_directory: Option<impl AsRef<std::path::Path>>, argv: &[&std::path::Path], envp: &[&std::path::Path], flags: SpawnFlags, child_setup: P, stdin_fd: i32, stdout_fd: i32, stderr_fd: i32, source_fds: &[i32], target_fds: &[i32], n_fds: usize) -> Result<(Pid, i32, i32, i32), crate::Error> {
752+
//pub fn spawn_async_with_pipes_and_fds(working_directory: Option<impl AsRef<std::path::Path>>, argv: &[&std::path::Path], envp: &[&std::path::Path], flags: SpawnFlags, child_setup: Option<Box_<dyn FnOnce() + 'static>>, stdin_fd: i32, stdout_fd: i32, stderr_fd: i32, source_fds: &[i32], target_fds: &[i32], n_fds: usize) -> Result<(Pid, i32, i32, i32), crate::Error> {
750753
// unsafe { TODO: call ffi:g_spawn_async_with_pipes_and_fds() }
751754
//}
752755

@@ -807,7 +810,7 @@ pub fn spawn_command_line_async(
807810
//}
808811

809812
//#[doc(alias = "g_spawn_sync")]
810-
//pub fn spawn_sync<P: FnOnce() + Send + Sync + 'static>(working_directory: Option<impl AsRef<std::path::Path>>, argv: &[&std::path::Path], envp: &[&std::path::Path], flags: SpawnFlags, child_setup: P, standard_output: Vec<u8>, standard_error: Vec<u8>) -> Result<i32, crate::Error> {
813+
//pub fn spawn_sync(working_directory: Option<impl AsRef<std::path::Path>>, argv: &[&std::path::Path], envp: &[&std::path::Path], flags: SpawnFlags, child_setup: Option<&mut dyn (FnMut())>, standard_output: Vec<u8>, standard_error: Vec<u8>) -> Result<i32, crate::Error> {
811814
// unsafe { TODO: call ffi:g_spawn_sync() }
812815
//}
813816

glib/src/auto/versions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
Generated by gir (https://github.com/gtk-rs/gir @ 0f2c059e0939)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 615ef8fb32f2)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 326eb5f2d5d8)

glib/sys/versions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
Generated by gir (https://github.com/gtk-rs/gir @ 0f2c059e0939)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 615ef8fb32f2)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 326eb5f2d5d8)

graphene/src/auto/versions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
Generated by gir (https://github.com/gtk-rs/gir @ 0f2c059e0939)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 615ef8fb32f2)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 326eb5f2d5d8)

0 commit comments

Comments
 (0)