Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions glib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ gio = ["gio-sys"]
name = "subclass_compiletest"
required-features = ["compiletests"]

[[test]]
name = "regex_compiletest"
required-features = ["compiletests"]

[[bench]]
name = "gstring"
harness = false
Expand Down
6 changes: 3 additions & 3 deletions glib/src/value_array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ impl ValueArray {
b: ffi::gconstpointer,
func: ffi::gpointer,
) -> i32 {
let func = func as *mut &mut (dyn FnMut(&Value, &Value) -> Ordering);
let func = func as *mut &mut dyn FnMut(&Value, &Value) -> Ordering;

let a = &*(a as *const Value);
let b = &*(b as *const Value);
Expand All @@ -127,9 +127,9 @@ impl ValueArray {
}
unsafe {
let mut func = compare_func;
let func_obj: &mut (dyn FnMut(&Value, &Value) -> Ordering) = &mut func;
let func_obj: &mut dyn FnMut(&Value, &Value) -> Ordering = &mut func;
let func_ptr =
&func_obj as *const &mut (dyn FnMut(&Value, &Value) -> Ordering) as ffi::gpointer;
&func_obj as *const &mut dyn FnMut(&Value, &Value) -> Ordering as ffi::gpointer;

gobject_ffi::g_value_array_sort_with_data(
self.to_glib_none_mut().0,
Expand Down
Loading