Update to current git

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

Author: elmarco

Cargo.toml

@@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 bitflags = "1.0"
 libc = "0.2"
-glib = { git = "https://github.com/gtk-rs/gtk-rs" }
+glib = { git = "https://github.com/gtk-rs/gtk-rs-core" }
 once_cell = "1.0"
 
 [lib]

src/bar/imp.rs

@@ -50,7 +50,7 @@ impl ObjectImpl for Bar {
     ) {
         match pspec.name() {
             "number" => {
-                let number = value.get().unwrap().unwrap();
+                let number = value.get().unwrap();
                 self.set_number(obj, number);
             }
             _ => unimplemented!(),
@@ -122,6 +122,6 @@ pub(crate) mod ffi {
 
     #[no_mangle]
     pub extern "C" fn ex_bar_get_type() -> glib::ffi::GType {
-        <super::Bar as glib::subclass::types::ObjectSubclassType>::type_().to_glib()
+        <super::super::Bar as glib::StaticType>::static_type().into_glib()
     }
 }

src/bar/mod.rs

@@ -52,7 +52,7 @@ impl Bar {
                 value.to_glib_none_mut().0,
             );
         }
-        value.get().unwrap().unwrap()
+        value.get().unwrap()
     }
 
     pub fn set_property_number(&self, num: f64) {

src/color/imp.rs

@@ -1,4 +1,4 @@
-use glib::translate::ToGlib;
+use glib::translate::IntoGlib;
 
 #[derive(Debug, Copy, Clone, glib::GEnum)]
 #[genum(type_name = "ExColor")]
@@ -12,14 +12,14 @@ pub(crate) mod ffi {
     use glib::translate::*;
     use glib::StaticType;
 
-    pub type ExColor = <super::Color as super::ToGlib>::GlibType;
+    pub type ExColor = <super::Color as super::IntoGlib>::GlibType;
 
     pub const EX_COLOR_RED: ExColor = super::Color::Red as i32;
     pub const EX_COLOR_GREEN: ExColor = super::Color::Green as i32;
     pub const EX_COLOR_BLUE: ExColor = super::Color::Blue as i32;
 
     #[no_mangle]
     pub unsafe extern "C" fn ex_color_get_type() -> glib::ffi::GType {
-        super::Color::static_type().to_glib()
+        super::Color::static_type().into_glib()
     }
 }

src/color/mod.rs

@@ -17,11 +17,11 @@ pub enum Color {
     __Unknown(i32),
 }
 
-impl ToGlib for Color {
+impl IntoGlib for Color {
     type GlibType = ffi::ExColor;
 
-    fn to_glib(&self) -> ffi::ExColor {
-        match *self {
+    fn into_glib(self) -> ffi::ExColor {
+        match self {
             Color::Red => ffi::EX_COLOR_RED,
             Color::Green => ffi::EX_COLOR_GREEN,
             Color::Blue => ffi::EX_COLOR_BLUE,
@@ -54,7 +54,7 @@ mod tests {
     #[test]
     fn test_enum() {
         let c = Color::Blue;
-        assert_eq!(c.to_glib(), 2);
+        assert_eq!(c.into_glib(), 2);
 
         let t = Color::static_type();
         assert!(t.is_a(glib::Type::ENUM));

src/flags/imp.rs

@@ -9,14 +9,14 @@ pub(crate) mod ffi {
     use glib::translate::*;
     use glib::StaticType;
 
-    pub type ExFlags = <super::Flags as ToGlib>::GlibType;
+    pub type ExFlags = <super::Flags as IntoGlib>::GlibType;
 
     pub const EX_FLAGS_SOME: ExFlags = super::Flags::SOME.bits();
     pub const EX_FLAGS_ZING: ExFlags = super::Flags::ZING.bits();
     pub const EX_FLAGS_BONG: ExFlags = super::Flags::BONG.bits();
 
     #[no_mangle]
     pub unsafe extern "C" fn ex_flags_get_type() -> glib::ffi::GType {
-        super::Flags::static_type().to_glib()
+        super::Flags::static_type().into_glib()
     }
 }

src/flags/mod.rs

@@ -18,10 +18,10 @@ bitflags! {
     }
 }
 
-impl ToGlib for Flags {
+impl IntoGlib for Flags {
     type GlibType = ffi::ExFlags;
 
-    fn to_glib(&self) -> ffi::ExFlags {
+    fn into_glib(self) -> ffi::ExFlags {
         self.bits()
     }
 }

src/foo/imp.rs

@@ -71,9 +71,9 @@ impl ObjectImpl for Foo {
                 glib::Type::UNIT.into(),
             )
             .class_handler(|_, args| {
-                let obj = args[0].get::<glib::Object>().unwrap().unwrap();
-                let val = args[1].get::<i32>().unwrap().unwrap();
-                let inc = args[2].get::<i32>().unwrap().unwrap();
+                let obj = args[0].get::<glib::Object>().unwrap();
+                let val = args[1].get::<i32>().unwrap();
+                let inc = args[2].get::<i32>().unwrap();
 
                 unsafe {
                     let klass = &*(obj.object_class() as *const _ as *const FooClass);
@@ -219,7 +219,7 @@ pub(crate) mod ffi {
 
     #[no_mangle]
     pub extern "C" fn ex_foo_get_type() -> glib::ffi::GType {
-        <super::Foo as glib::subclass::types::ObjectSubclassType>::type_().to_glib()
+        <super::super::Foo as glib::StaticType>::static_type().into_glib()
     }
 }
 

src/foo/mod.rs

@@ -59,7 +59,7 @@ impl<O: IsA<Foo>> FooExt for O {
     }
 
     fn property_name(&self) -> Option<String> {
-        let mut value = glib::Value::from(None::<&str>);
+        let mut value = glib::Value::for_value_type::<&str>();
         unsafe {
             glib::gobject_ffi::g_object_get_property(
                 self.as_ptr() as *mut glib::gobject_ffi::GObject,

src/nameable/imp.rs

@@ -48,7 +48,7 @@ impl NameableInterface {
 }
 
 pub(crate) mod ffi {
-    use glib::translate::ToGlib;
+    use glib::translate::IntoGlib;
     use libc::c_char;
     use std::ptr;
 
@@ -58,7 +58,7 @@ pub(crate) mod ffi {
     #[no_mangle]
     pub extern "C" fn ex_nameable_get_type() -> glib::ffi::GType {
         <super::NameableInterface as glib::subclass::interface::ObjectInterfaceType>::type_()
-            .to_glib()
+            .into_glib()
     }
 
     // Virtual method callers