packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rewrite handwritten futures functions

This commit is contained in:
Felix Krull 2019-12-15 15:00:53 +01:00 committed by Colin Walters
parent 3e70feb75f
commit 3290d5c2d1
4 changed files with 35 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
rust-bindings/rust/src/functions.rs
View File

@ -1,22 +1,15 @@
#[cfg(any(feature = "v2017_13", feature = "dox"))] #[cfg(any(feature = "v2017_13", feature = "dox"))]
use crate::ChecksumFlags; use crate::ChecksumFlags;
use crate::{Checksum, ObjectType}; use crate::{Checksum, ObjectType};
#[cfg(feature = "futures")] use glib::{prelude::*, translate::*};
use futures::future;
use glib::prelude::*;
use glib::translate::*;
use glib_sys::GFALSE; use glib_sys::GFALSE;
#[cfg(feature = "futures")] use std::{future::Future, mem::MaybeUninit, pin::Pin, ptr};
use std::boxed::Box as Box_;
use std::error;
use std::mem::MaybeUninit;
use std::ptr;
pub fn checksum_file<P: IsA<gio::File>, Q: IsA<gio::Cancellable>>( pub fn checksum_file<P: IsA<gio::File>, Q: IsA<gio::Cancellable>>(
f: &P, f: &P,
objtype: ObjectType, objtype: ObjectType,
cancellable: Option<&Q>, cancellable: Option<&Q>,
) -> Result<Checksum, Box<dyn error::Error>> { ) -> Result<Checksum, Box<dyn std::error::Error>> {
unsafe { unsafe {
let mut out_csum = ptr::null_mut(); let mut out_csum = ptr::null_mut();
let mut error = ptr::null_mut(); let mut error = ptr::null_mut();
@ -34,7 +27,7 @@ pub fn checksum_file<P: IsA<gio::File>, Q: IsA<gio::Cancellable>>(
pub fn checksum_file_async< pub fn checksum_file_async<
P: IsA<gio::File>, P: IsA<gio::File>,
Q: IsA<gio::Cancellable>, Q: IsA<gio::Cancellable>,
R: FnOnce(Result<Checksum, Box<dyn error::Error>>) + Send + 'static, R: FnOnce(Result<Checksum, Box<dyn std::error::Error>>) + Send + 'static,
>( >(
f: &P, f: &P,
objtype: ObjectType, objtype: ObjectType,
@ -44,7 +37,7 @@ pub fn checksum_file_async<
) { ) {
let user_data: Box<R> = Box::new(callback); let user_data: Box<R> = Box::new(callback);
unsafe extern "C" fn checksum_file_async_trampoline< unsafe extern "C" fn checksum_file_async_trampoline<
R: FnOnce(Result<Checksum, Box<dyn error::Error>>) + Send + 'static, R: FnOnce(Result<Checksum, Box<dyn std::error::Error>>) + Send + 'static,
>( >(
_source_object: *mut gobject_sys::GObject, _source_object: *mut gobject_sys::GObject,
res: *mut gio_sys::GAsyncResult, res: *mut gio_sys::GAsyncResult,
@ -76,25 +69,20 @@ pub fn checksum_file_async<
} }
} }
#[cfg(feature = "futures")] #[allow(clippy::type_complexity)]
pub fn checksum_file_async_future<P: IsA<gio::File> + Clone + 'static>( pub fn checksum_file_async_future<P: IsA<gio::File> + Clone + 'static>(
f: &P, f: &P,
objtype: ObjectType, objtype: ObjectType,
io_priority: i32, io_priority: i32,
) -> Box_<dyn future::Future<Output = Result<Checksum, Box<dyn error::Error>>> + std::marker::Unpin> ) -> Pin<Box<dyn Future<Output = Result<Checksum, Box<dyn std::error::Error>>> + 'static>> {
{
use fragile::Fragile;
use gio::GioFuture;
let f = f.clone(); let f = f.clone();
GioFuture::new(&f, move |f, send| { Box::pin(gio::GioFuture::new(&f, move |f, send| {
let cancellable = gio::Cancellable::new(); let cancellable = gio::Cancellable::new();
let send = Fragile::new(send);
checksum_file_async(f, objtype, io_priority, Some(&cancellable), move |res| { checksum_file_async(f, objtype, io_priority, Some(&cancellable), move |res| {
let _ = send.into_inner().send(res); send.resolve(res);
}); });
cancellable cancellable
}) }))
} }
pub fn checksum_file_from_input<P: IsA<gio::InputStream>, Q: IsA<gio::Cancellable>>( pub fn checksum_file_from_input<P: IsA<gio::InputStream>, Q: IsA<gio::Cancellable>>(
@ -103,7 +91,7 @@ pub fn checksum_file_from_input<P: IsA<gio::InputStream>, Q: IsA<gio::Cancellabl
in_: Option<&P>, in_: Option<&P>,
objtype: ObjectType, objtype: ObjectType,
cancellable: Option<&Q>, cancellable: Option<&Q>,
) -> Result<Checksum, Box<dyn error::Error>> { ) -> Result<Checksum, Box<dyn std::error::Error>> {
unsafe { unsafe {
let mut out_csum = ptr::null_mut(); let mut out_csum = ptr::null_mut();
let mut error = ptr::null_mut(); let mut error = ptr::null_mut();
@ -156,7 +144,7 @@ unsafe fn checksum_file_error(
out_csum: *mut [*mut u8; 32], out_csum: *mut [*mut u8; 32],
error: *mut glib_sys::GError, error: *mut glib_sys::GError,
ret: i32, ret: i32,
) -> Result<Checksum, Box<dyn error::Error>> { ) -> Result<Checksum, Box<dyn std::error::Error>> {
if !error.is_null() { if !error.is_null() {
Err(Box::<glib::Error>::new(from_glib_full(error))) Err(Box::<glib::Error>::new(from_glib_full(error)))
} else if ret == GFALSE { } else if ret == GFALSE {

9
rust-bindings/rust/src/kernel_args.rs
View File

@ -9,7 +9,6 @@ use ostree_sys;
use ostree_sys::OstreeKernelArgs; use ostree_sys::OstreeKernelArgs;
use std::fmt; use std::fmt;
use std::ptr; use std::ptr;
use Error;
glib_wrapper! { glib_wrapper! {
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)] #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
@ -54,7 +53,7 @@ impl KernelArgs {
pub fn append_proc_cmdline<P: IsA<gio::Cancellable>>( pub fn append_proc_cmdline<P: IsA<gio::Cancellable>>(
&mut self, &mut self,
cancellable: Option<&P>, cancellable: Option<&P>,
) -> Result<(), Error> { ) -> Result<(), glib::Error> {
unsafe { unsafe {
let mut error = ptr::null_mut(); let mut error = ptr::null_mut();
let _ = ostree_sys::ostree_kernel_args_append_proc_cmdline( let _ = ostree_sys::ostree_kernel_args_append_proc_cmdline(
@ -70,7 +69,7 @@ impl KernelArgs {
} }
} }
pub fn delete(&mut self, arg: &str) -> Result<(), Error> { pub fn delete(&mut self, arg: &str) -> Result<(), glib::Error> {
unsafe { unsafe {
let mut error = ptr::null_mut(); let mut error = ptr::null_mut();
let _ = ostree_sys::ostree_kernel_args_delete( let _ = ostree_sys::ostree_kernel_args_delete(
@ -87,7 +86,7 @@ impl KernelArgs {
} }
#[cfg(any(feature = "v2019_3", feature = "dox"))] #[cfg(any(feature = "v2019_3", feature = "dox"))]
pub fn delete_key_entry(&mut self, key: &str) -> Result<(), Error> { pub fn delete_key_entry(&mut self, key: &str) -> Result<(), glib::Error> {
unsafe { unsafe {
let mut error = ptr::null_mut(); let mut error = ptr::null_mut();
let _ = ostree_sys::ostree_kernel_args_delete_key_entry( let _ = ostree_sys::ostree_kernel_args_delete_key_entry(
@ -114,7 +113,7 @@ impl KernelArgs {
} }
#[cfg(any(feature = "v2019_3", feature = "dox"))] #[cfg(any(feature = "v2019_3", feature = "dox"))]
pub fn new_replace(&mut self, arg: &str) -> Result<(), Error> { pub fn new_replace(&mut self, arg: &str) -> Result<(), glib::Error> {
unsafe { unsafe {
let mut error = ptr::null_mut(); let mut error = ptr::null_mut();
let _ = ostree_sys::ostree_kernel_args_new_replace( let _ = ostree_sys::ostree_kernel_args_new_replace(

43
rust-bindings/rust/src/repo.rs
View File

@ -1,17 +1,18 @@
#[cfg(any(feature = "v2016_4", feature = "dox"))] #[cfg(any(feature = "v2016_4", feature = "dox"))]
use crate::RepoListRefsExtFlags; use crate::RepoListRefsExtFlags;
use crate::{Checksum, ObjectName, ObjectType, Repo}; use crate::{Checksum, ObjectName, ObjectType, Repo};
use gio;
use gio_sys; use gio_sys;
use glib; use glib::{self, translate::*, Error, IsA};
use glib::translate::*;
use glib::Error;
use glib::IsA;
use glib_sys; use glib_sys;
use ostree_sys; use ostree_sys;
use std::collections::{HashMap, HashSet}; use std::{
use std::path::Path; collections::{HashMap, HashSet},
use std::{mem::MaybeUninit, ptr}; future::Future,
mem::MaybeUninit,
path::Path,
pin::Pin,
ptr,
};
unsafe extern "C" fn read_variant_table( unsafe extern "C" fn read_variant_table(
_key: glib_sys::gpointer, _key: glib_sys::gpointer,
@ -226,15 +227,11 @@ impl Repo {
expected_checksum: Option<&str>, expected_checksum: Option<&str>,
object: &P, object: &P,
length: u64, length: u64,
) -> Box_<dyn future::Future<Output = Result<Checksum, Error>> + std::marker::Unpin> { ) -> Pin<Box<dyn Future<Output = Result<Checksum, Error>> + 'static>> {
use fragile::Fragile;
use gio::GioFuture;
let expected_checksum = expected_checksum.map(ToOwned::to_owned); let expected_checksum = expected_checksum.map(ToOwned::to_owned);
let object = object.clone(); let object = object.clone();
GioFuture::new(self, move |obj, send| { Box::pin(gio::GioFuture::new(self, move |obj, send| {
let cancellable = gio::Cancellable::new(); let cancellable = gio::Cancellable::new();
let send = Fragile::new(send);
obj.write_content_async( obj.write_content_async(
expected_checksum expected_checksum
.as_ref() .as_ref()
@ -243,12 +240,11 @@ impl Repo {
length, length,
Some(&cancellable), Some(&cancellable),
move |res| { move |res| {
let _ = send.into_inner().send(res); send.resolve(res);
}, },
); );
cancellable cancellable
}) }))
} }
pub fn write_metadata_async< pub fn write_metadata_async<
@ -306,15 +302,11 @@ impl Repo {
objtype: ObjectType, objtype: ObjectType,
expected_checksum: Option<&str>, expected_checksum: Option<&str>,
object: &glib::Variant, object: &glib::Variant,
) -> Box_<dyn future::Future<Output = Result<Checksum, Error>> + std::marker::Unpin> { ) -> Pin<Box<dyn Future<Output = Result<Checksum, Error>> + 'static>> {
use fragile::Fragile;
use gio::GioFuture;
let expected_checksum = expected_checksum.map(ToOwned::to_owned); let expected_checksum = expected_checksum.map(ToOwned::to_owned);
let object = object.clone(); let object = object.clone();
GioFuture::new(self, move |obj, send| { Box::pin(gio::GioFuture::new(self, move |obj, send| {
let cancellable = gio::Cancellable::new(); let cancellable = gio::Cancellable::new();
let send = Fragile::new(send);
obj.write_metadata_async( obj.write_metadata_async(
objtype, objtype,
expected_checksum expected_checksum
@ -323,11 +315,10 @@ impl Repo {
&object, &object,
Some(&cancellable), Some(&cancellable),
move |res| { move |res| {
let _ = send.into_inner().send(res); send.resolve(res);
}, },
); );
cancellable cancellable
}) }))
} }
} }

7
rust-bindings/rust/tests/repo/mod.rs
View File

@ -1,9 +1,6 @@
use crate::util::*; use crate::util::*;
use gio::prelude::*; use gio::{prelude::*, NONE_CANCELLABLE};
use gio::NONE_CANCELLABLE; use ostree::{ObjectType, *};
use glib::prelude::*;
use ostree::ObjectType;
use ostree::*;
#[cfg(feature = "v2016_8")] #[cfg(feature = "v2016_8")]
mod checkout_at; mod checkout_at;