Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 06:25:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Match "utility" rather than "pair" when generating style struct bindings.

Browse source
This commit is contained in:
Bobby Holley 2016-05-06 16:36:01 -07:00
parent a778b03f36
commit ceb7dcb605
2 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
ports/geckolib/gecko_style_structs.rs
View file

@ -64,7 +64,6 @@ pub const NS_ERROR_MODULE_BASE_OFFSET: ::std::os::raw::c_uint = 69;
pub const MOZ_STRING_WITH_OBSOLETE_API: ::std::os::raw::c_uint = 1; pub const MOZ_STRING_WITH_OBSOLETE_API: ::std::os::raw::c_uint = 1;
pub const NSID_LENGTH: ::std::os::raw::c_uint = 39; pub const NSID_LENGTH: ::std::os::raw::c_uint = 39;
pub const NS_NUMBER_OF_FLAGS_IN_REFCNT: ::std::os::raw::c_uint = 2; pub const NS_NUMBER_OF_FLAGS_IN_REFCNT: ::std::os::raw::c_uint = 2;
pub const _STL_PAIR_H: ::std::os::raw::c_uint = 1;
pub const TWIPS_PER_POINT_INT: ::std::os::raw::c_uint = 20; pub const TWIPS_PER_POINT_INT: ::std::os::raw::c_uint = 20;
pub const POINTS_PER_INCH_INT: ::std::os::raw::c_uint = 72; pub const POINTS_PER_INCH_INT: ::std::os::raw::c_uint = 72;
pub const NS_FONT_VARIANT_NORMAL: ::std::os::raw::c_uint = 0; pub const NS_FONT_VARIANT_NORMAL: ::std::os::raw::c_uint = 0;
@ -2508,13 +2507,28 @@ pub struct piecewise_construct_t;
impl ::std::clone::Clone for piecewise_construct_t { impl ::std::clone::Clone for piecewise_construct_t {
fn clone(&self) -> Self { *self } fn clone(&self) -> Self { *self }
} }
pub enum tuple { }
#[repr(C)] #[repr(C)]
#[derive(Debug, Copy, Clone)] #[derive(Debug, Copy, Clone)]
pub struct pair<_T1, _T2> { pub struct pair<_T1, _T2> {
pub first: _T1, pub first: _T1,
pub second: _T2, pub second: _T2,
} }
#[repr(C)]
#[derive(Debug, Copy, Clone)]
pub struct __make_pair_return_impl<_Tp> {
pub _phantom0: ::std::marker::PhantomData<_Tp>,
}
#[repr(C)]
#[derive(Debug, Copy, Clone)]
pub struct __make_pair_return<_Tp> {
pub _phantom0: ::std::marker::PhantomData<_Tp>,
}
#[repr(C)]
#[derive(Debug, Copy)]
pub struct __get_pair;
impl ::std::clone::Clone for __get_pair {
fn clone(&self) -> Self { *self }
}
pub type Float = f32; pub type Float = f32;
#[repr(i8)] #[repr(i8)]
#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)] #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]

2
ports/geckolib/tools/regen_style_structs.sh
View file

@ -95,7 +95,7 @@ export RUST_BACKTRACE=1
-match "nsDataHashtable.h" \ -match "nsDataHashtable.h" \
-match "nsCSSScanner.h" \ -match "nsCSSScanner.h" \
-match "Types.h" \ -match "Types.h" \
-match "pair" \ -match "utility" \
-match "SheetParsingMode.h" \ -match "SheetParsingMode.h" \
-blacklist-type "IsDestructibleFallbackImpl" \ -blacklist-type "IsDestructibleFallbackImpl" \
-blacklist-type "IsDestructibleFallback" \ -blacklist-type "IsDestructibleFallback" \