Merge pull request #61 from vhdirk/regenerate

regenerate from latest gir files
tauri-apps · Nov 3, 2021 · c216072 · c216072
2 parents 4494852 + 68fa7e5
commit c216072
Show file tree

Hide file tree

Showing 32 changed files with 302 additions and 64 deletions.
diff --git a/.changes/config.json b/.changes/config.json
@@ -79,7 +79,7 @@
   },
   "packages": {
     "javascriptcore-rs-sys": {
-      "path": "./javascriptcore-sys",
+      "path": "./sys",
       "manager": "rust"
     },
     "javascriptcore-rs": {

diff --git a/.changes/regen.md b/.changes/regen.md
@@ -0,0 +1,7 @@
+---
+"javascriptcore-rs-sys": patch
+"javascriptcore-rs": patch
+---
+
+Regenerate with latest gir-files
+
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "gir-files"]
 	path = gir-files
-	url = https://github.com/wusyong/gir-files
+	url = https://github.com/tauri-apps/gir-files
 [submodule "gir"]
 	path = gir
 	url = https://github.com/gtk-rs/gir
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "javascriptcore-rs"
-version = "0.15.1"
+version = "0.15.4"
 edition = "2018"
 description = "Rust bindings for the javacriptcore library"
 repository = "https://github.com/tauri-apps/javascriptcore-rs"
@@ -19,8 +19,8 @@ bitflags = "^1.0"
 
   [dependencies.ffi]
   package = "javascriptcore-rs-sys"
-  path = "./javascriptcore-sys"
-  version = "0.3.0"
+  path = "./sys"
+  version = "0.3.2"
 
 [features]
 v2_28 = [ "ffi/v2_28" ]

diff --git a/Gir.toml b/Gir.toml
@@ -4,14 +4,11 @@ version = "4.0"
 target_path = "."
 min_cfg_version = "2.24"
 work_mode = "normal"
-girs_directories = [ "gir-files/" ]
+girs_directories = ["gir-files/"]
 deprecate_by_min_version = true
 single_version_file = true
 
-external_libraries = [
-    "GLib",
-    "GObject",
-]
+external_libraries = ["GLib", "GObject"]
 
 generate = [
     "JavaScriptCore.CheckSyntaxMode",
@@ -32,7 +29,6 @@ generate = [
     "JavaScriptCore.PropertyGetter",
     "JavaScriptCore.PropertySetter",
     "JavaScriptCore.Setter",
-    "JavaScriptCore.StringRef",
     "JavaScriptCore.ValuePropertyFlags",
     "JavaScriptCore.VariadicFunction",
     "JavaScriptCore.VirtualMachine",
@@ -43,6 +39,8 @@ manual = [
     "GLib.DestroyNotify",
     "GLib.OptionGroup",
     "GObject.Callback",
+    "JavaScriptCore.StringRef",
+    "JavaScriptCore.GlobalContextRef",
 ]
 
 [[object]]
@@ -55,8 +53,11 @@ name = "JavaScriptCore.Value"
 status = "generate"
 generate_builder = true
 
+[[object.function]]
+name = "object_define_property_accessor"
+ignore = true
+
 [[object]]
 name = "JavaScriptCore.WeakValue"
 status = "generate"
 generate_builder = true
-
diff --git a/generator.py b/generator.py
@@ -0,0 +1 @@
+gir/generator.py
diff --git a/gir b/gir
diff --git a/gir-files b/gir-files
diff --git a/src/auto/class.rs b/src/auto/class.rs
@@ -1,5 +1,5 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/wusyong/gir-files)
+// from gir-files (https://github.com/vhdirk/gir-files)
 // DO NOT EDIT
 
 use glib::translate::*;
@@ -21,7 +21,7 @@ impl Class {
   //}
 
   //#[doc(alias = "jsc_class_add_constructor_variadic")]
-  //pub fn add_constructor_variadic<P: Fn() + 'static>(&self, name: Option<&str>, callback: P, user_data: /*Unimplemented*/Option<Fundamental: Pointer>, return_type: glib::types::Type) -> Option<Value> {
+  //pub fn add_constructor_variadic(&self, name: Option<&str>, callback: /*Unimplemented*/Fn(/*Ignored*/glib::PtrArray) -> /*Unimplemented*/Fundamental: Pointer, user_data: /*Unimplemented*/Option<Fundamental: Pointer>, return_type: glib::types::Type) -> Option<Value> {
   //    unsafe { TODO: call ffi:jsc_class_add_constructor_variadic() }
   //}
 
@@ -36,7 +36,7 @@ impl Class {
   //}
 
   //#[doc(alias = "jsc_class_add_method_variadic")]
-  //pub fn add_method_variadic<P: Fn() + 'static>(&self, name: &str, callback: P, user_data: /*Unimplemented*/Option<Fundamental: Pointer>, return_type: glib::types::Type) {
+  //pub fn add_method_variadic(&self, name: &str, callback: /*Unimplemented*/Fn(/*Unimplemented*/Fundamental: Pointer, /*Ignored*/glib::PtrArray) -> Value, user_data: /*Unimplemented*/Option<Fundamental: Pointer>, return_type: glib::types::Type) {
   //    unsafe { TODO: call ffi:jsc_class_add_method_variadic() }
   //}
 
@@ -46,7 +46,7 @@ impl Class {
   //}
 
   //#[doc(alias = "jsc_class_add_property")]
-  //pub fn add_property(&self, name: &str, property_type: glib::types::Type, getter: Option<Box_<dyn FnOnce() + 'static>>, setter: Option<Box_<dyn Fn() + 'static>>, user_data: /*Unimplemented*/Option<Fundamental: Pointer>) {
+  //pub fn add_property(&self, name: &str, property_type: glib::types::Type, getter: /*Unimplemented*/Fn(/*Unimplemented*/Fundamental: Pointer) -> Value, setter: /*Unimplemented*/Fn(/*Unimplemented*/Fundamental: Pointer, &Value), user_data: /*Unimplemented*/Option<Fundamental: Pointer>) {
   //    unsafe { TODO: call ffi:jsc_class_add_property() }
   //}
 

diff --git a/src/auto/context.rs b/src/auto/context.rs
@@ -1,5 +1,5 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/wusyong/gir-files)
+// from gir-files (https://github.com/vhdirk/gir-files)
 // DO NOT EDIT
 
 use crate::{CheckSyntaxMode, CheckSyntaxResult, Exception, Value, VirtualMachine};

diff --git a/src/auto/enums.rs b/src/auto/enums.rs
@@ -1,5 +1,5 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/wusyong/gir-files)
+// from gir-files (https://github.com/vhdirk/gir-files)
 // DO NOT EDIT
 
 use glib::translate::*;

diff --git a/src/auto/exception.rs b/src/auto/exception.rs
@@ -1,5 +1,5 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/wusyong/gir-files)
+// from gir-files (https://github.com/vhdirk/gir-files)
 // DO NOT EDIT
 
 use crate::Context;

diff --git a/src/auto/flags.rs b/src/auto/flags.rs
@@ -1,5 +1,5 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/wusyong/gir-files)
+// from gir-files (https://github.com/vhdirk/gir-files)
 // DO NOT EDIT
 
 use bitflags::bitflags;

diff --git a/src/auto/mod.rs b/src/auto/mod.rs
@@ -1,5 +1,5 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/wusyong/gir-files)
+// from gir-files (https://github.com/vhdirk/gir-files)
 // DO NOT EDIT
 
 mod class;

diff --git a/src/auto/value.rs b/src/auto/value.rs
@@ -1,5 +1,5 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/wusyong/gir-files)
+// from gir-files (https://github.com/vhdirk/gir-files)
 // DO NOT EDIT
 
 use crate::{Context, ValuePropertyFlags};
@@ -74,7 +74,7 @@ impl Value {
   //}
 
   //#[doc(alias = "jsc_value_new_function_variadic")]
-  //pub fn new_function_variadic<P: Fn() + 'static>(context: &impl IsA<Context>, name: Option<&str>, callback: P, user_data: /*Unimplemented*/Option<Fundamental: Pointer>, return_type: glib::types::Type) -> Value {
+  //pub fn new_function_variadic(context: &impl IsA<Context>, name: Option<&str>, callback: /*Unimplemented*/Fn(/*Ignored*/glib::PtrArray) -> Value, user_data: /*Unimplemented*/Option<Fundamental: Pointer>, return_type: glib::types::Type) -> Value {
   //    unsafe { TODO: call ffi:jsc_value_new_function_variadic() }
   //}
 
@@ -226,9 +226,6 @@ pub trait ValueExt: 'static {
   #[doc(alias = "jsc_value_is_undefined")]
   fn is_undefined(&self) -> bool;
 
-  //#[doc(alias = "jsc_value_object_define_property_accessor")]
-  //fn object_define_property_accessor(&self, property_name: &str, flags: ValuePropertyFlags, property_type: glib::types::Type, getter: Option<Box_<dyn FnOnce() + 'static>>, setter: Option<Box_<dyn Fn() + 'static>>, user_data: /*Unimplemented*/Option<Fundamental: Pointer>);
-
   #[doc(alias = "jsc_value_object_define_property_data")]
   fn object_define_property_data(
     &self,
@@ -364,10 +361,6 @@ impl<O: IsA<Value>> ValueExt for O {
     unsafe { from_glib(ffi::jsc_value_is_undefined(self.as_ref().to_glib_none().0)) }
   }
 
-  //fn object_define_property_accessor(&self, property_name: &str, flags: ValuePropertyFlags, property_type: glib::types::Type, getter: Option<Box_<dyn FnOnce() + 'static>>, setter: Option<Box_<dyn Fn() + 'static>>, user_data: /*Unimplemented*/Option<Fundamental: Pointer>) {
-  //    unsafe { TODO: call ffi:jsc_value_object_define_property_accessor() }
-  //}
-
   fn object_define_property_data(
     &self,
     property_name: &str,

diff --git a/src/auto/versions.txt b/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 05fe12c0b7e7)
-from gir-files (https://github.com/wusyong/gir-files @ d11622cc2fc4)
+Generated by gir (https://github.com/gtk-rs/gir @ a97e6087cf6b)
+from gir-files (https://github.com/vhdirk/gir-files @ 5c5c482b7f4a)
diff --git a/src/auto/virtual_machine.rs b/src/auto/virtual_machine.rs
@@ -1,5 +1,5 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/wusyong/gir-files)
+// from gir-files (https://github.com/vhdirk/gir-files)
 // DO NOT EDIT
 
 use glib::translate::*;

diff --git a/src/auto/weak_value.rs b/src/auto/weak_value.rs
@@ -1,5 +1,5 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/wusyong/gir-files)
+// from gir-files (https://github.com/vhdirk/gir-files)
 // DO NOT EDIT
 
 use crate::Value;

diff --git a/src/global_context_ref.rs b/src/global_context_ref.rs
@@ -0,0 +1,28 @@
+use ffi::*;
+use glib::translate::*;
+use std::ptr;
+
+pub struct GlobalContextRef {
+  raw: JSGlobalContextRef,
+}
+
+impl FromGlibPtrNone<JSGlobalContextRef> for GlobalContextRef {
+  unsafe fn from_glib_none(ptr: JSGlobalContextRef) -> Self {
+    GlobalContextRef { raw: ptr }
+  }
+}
+
+impl FromGlibPtrFull<JSGlobalContextRef> for GlobalContextRef {
+  unsafe fn from_glib_full(ptr: JSGlobalContextRef) -> Self {
+    GlobalContextRef { raw: ptr }
+  }
+}
+
+impl<'a> ToGlibPtr<'a, JSGlobalContextRef> for GlobalContextRef {
+  type Storage = ();
+
+  #[inline]
+  fn to_glib_none(&self) -> Stash<'a, JSGlobalContextRef, GlobalContextRef> {
+    Stash(self.raw, ())
+  }
+}
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,5 +1,18 @@
+// // Copyright 2013-2017, The Gtk-rs Project Developers.
+// // See the COPYRIGHT file at the top-level directory of this distribution.
+// // Licensed under the MIT license, see the LICENSE file or <https://opensource.org/licenses/MIT>
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
 
-pub use auto::{traits::*, *};
+use ffi::*;
+use glib::translate::{FromGlibPtrFull, FromGlibPtrNone};
+use std::ptr;
 
 mod auto;
+pub use auto::{traits::*, *};
+mod global_context_ref;
+mod string_ref;
+mod value_ref;
+
+pub use global_context_ref::*;
+pub use string_ref::*;
+pub use value_ref::*;
diff --git a/src/string_ref.rs b/src/string_ref.rs
@@ -0,0 +1,27 @@
+// This file was generated by gir (https://github.com/gtk-rs/gir)
+// from gir-files (https://github.com/vhdirk/gir-files)
+// DO NOT EDIT
+
+use glib::translate::*;
+
+glib::wrapper! {
+    #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+    pub struct StringRef(Shared<ffi::JSStringRef>);
+
+    match fn {
+        ref => |ptr| ffi::JSStringRetain(*ptr),
+        unref => |ptr| ffi::JSStringRelease(*ptr),
+    }
+}
+
+impl StringRef {
+  #[doc(alias = "JSStringGetMaximumUTF8CStringSize")]
+  pub fn maximum_utf8_cstring_size(&self) -> usize {
+    unsafe { ffi::JSStringGetMaximumUTF8CStringSize(*self.to_glib_none().0) }
+  }
+
+  // #[doc(alias = "JSStringGetUTF8CString")]
+  // pub fn getUTF8CString(&self, buffer: glib::GString, buffer_size: usize) -> usize {
+  //    unsafe { ffi::JSStringGetUTF8CString(*self.to_glib_none().0, buffer.to_glib_f) }
+  // }
+}