<div dir="ltr"><div>> I guess this is a stray debug message?</div><div> </div><div>Yes. I'm sorry...</div><div> </div>> we did *not* check them into git.<div> </div><div>Really? Does it mean that every time you build the library, Cargo.toml is generated? </div><div> </div><div>> The actual test parts of this patch are fine, but you need to spend a</div>> bit of time with ‘git rebase -i’ to move parts of patch 3 into patch 2. <div> </div><div>Does this mean that the followings should be moved to patch 2?</div><div> </div><div> generator/<a href="http://rust.ml/" rel="noreferrer" target="_blank">rust.ml</a> | 13 ++++++++--- <a href="http://run.in/" rel="noreferrer" target="_blank">run.in</a> | 9 ++++++++ rust/Cargo.lock | 6 +++++ rust/Cargo.toml | 4 +--- </div><div> </div><div>Regards,</div><div>Hiroyuki</div><div> </div></div> <div class="gmail_quote"><div dir="ltr" class="gmail_attr">2019年6月27日(木) 17:52 Richard W.M. Jones <<a href="mailto:rjones@redhat.com">rjones@redhat.com</a>>: </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On Thu, Jun 27, 2019 at 05:06:04PM +0900, Hiroyuki Katsura wrote: > From: Hiroyuki_Katsura <<a href="mailto:hiroyuki.katsura.0513@gmail.com" target="_blank">hiroyuki.katsura.0513@gmail.com</a>> > > --- > generator/<a href="http://rust.ml" rel="noreferrer" target="_blank">rust.ml</a> | 13 ++++++++--- > <a href="http://run.in" rel="noreferrer" target="_blank">run.in</a> | 9 ++++++++ > rust/Cargo.lock | 6 +++++ > rust/Cargo.toml | 4 +--- > rust/tests/<a href="http://010_load.rs" rel="noreferrer" target="_blank">010_load.rs</a> | 24 +++++++++++++++++++ > rust/tests/<a href="http://020_create.rs" rel="noreferrer" target="_blank">020_create.rs</a> | 24 +++++++++++++++++++ > rust/tests/<a href="http://030_create_flags.rs" rel="noreferrer" target="_blank">030_create_flags.rs</a> | 30 ++++++++++++++++++++++++ > rust/tests/<a href="http://040_create_multiple.rs" rel="noreferrer" target="_blank">040_create_multiple.rs</a> | 38 +++++++++++++++++++++++++++++++ > 8 files changed, 142 insertions(+), 6 deletions(-) > create mode 100644 rust/Cargo.lock > create mode 100644 rust/tests/<a href="http://010_load.rs" rel="noreferrer" target="_blank">010_load.rs</a> > create mode 100644 rust/tests/<a href="http://020_create.rs" rel="noreferrer" target="_blank">020_create.rs</a> > create mode 100644 rust/tests/<a href="http://030_create_flags.rs" rel="noreferrer" target="_blank">030_create_flags.rs</a> > create mode 100644 rust/tests/<a href="http://040_create_multiple.rs" rel="noreferrer" target="_blank">040_create_multiple.rs</a> > > diff --git a/generator/<a href="http://rust.ml" rel="noreferrer" target="_blank">rust.ml</a> b/generator/<a href="http://rust.ml" rel="noreferrer" target="_blank">rust.ml</a> > index dbe9db010..251eb1594 100644 > --- a/generator/<a href="http://rust.ml" rel="noreferrer" target="_blank">rust.ml</a> > +++ b/generator/<a href="http://rust.ml" rel="noreferrer" target="_blank">rust.ml</a> > @@ -37,14 +37,16 @@ let generate_rust () = > #[allow(non_camel_case_types)] > enum guestfs_h {} > > +#[link(name = \"guestfs\")] > extern \"C\" { > fn guestfs_create() -> *mut guestfs_h; > fn guestfs_create_flags(flags: i64) -> *mut guestfs_h; > fn guestfs_close(g: *mut guestfs_h); > - static GUESTFS_CREATE_NO_ENVIRONMENT: i64; > - static GUESTFS_CREATE_NO_CLOSE_ON_EXIT: i64; > } > > +const GUESTFS_CREATE_NO_ENVIRONMENT: i64 = 1; > +const GUESTFS_CREATE_NO_CLOSE_ON_EXIT: i64 = 2; > + > pub struct Handle { > g: *mut guestfs_h, > } > @@ -61,13 +63,17 @@ pub struct CreateFlags { > } > > impl CreateFlags { > - pub fn new() -> CreateFlags { > + pub fn none() -> CreateFlags { > CreateFlags { > create_no_environment_flag: false, > create_no_close_on_exit_flag: false, > } > } > > + pub fn new() -> CreateFlags { > + CreateFlags::none() > + } > + > pub fn create_no_environment(mut self, flag: bool) -> CreateFlags { > self.create_no_environment_flag = flag; > self Shouldn't these changes be folded into patch 2? > @@ -97,6 +103,7 @@ impl CreateFlags { > impl Handle { > pub fn create() -> Result<Handle, &'static str> { > let g = unsafe { guestfs_create() }; > + println!(\"hoge\"); I guess this is a stray debug message? > if g.is_null() { > Err(\"failed to create guestfs handle\") > } else { > diff --git a/<a href="http://run.in" rel="noreferrer" target="_blank">run.in</a> b/<a href="http://run.in" rel="noreferrer" target="_blank">run.in</a> > index 488e1b937..301b02664 100755 > --- a/<a href="http://run.in" rel="noreferrer" target="_blank">run.in</a> > +++ b/<a href="http://run.in" rel="noreferrer" target="_blank">run.in</a> > @@ -201,6 +201,15 @@ else > fi > export CGO_LDFLAGS > > +# For rust > +export RUST="@RUST@" > +if [ -z "$RUSTFLAGS" ]; then > + RUSTFLAGS="-C link-args=-L$b/lib/.libs" > +else > + RUSTFLAGS="$RUSTFLAGS -C link-args=-L$b/lib/.libs" > +fi > +export RUSTFLAGS > + > # For GObject, Javascript and friends. > export GJS="@GJS@" > prepend GI_TYPELIB_PATH "$b/gobject" > diff --git a/rust/Cargo.lock b/rust/Cargo.lock > new file mode 100644 > index 000000000..c03586e3f > --- /dev/null > +++ b/rust/Cargo.lock > @@ -0,0 +1,6 @@ > +# This file is automatically @generated by Cargo. > +# It is not intended for manual editing. > +[[package]] > +name = "guestfs" > +version = "0.1.0" > + > diff --git a/rust/Cargo.toml b/rust/Cargo.toml > index 6cd94ce6a..4ea7c299b 100644 > --- a/rust/Cargo.toml > +++ b/rust/Cargo.toml > @@ -1,8 +1,6 @@ > [package] > -name = "rust" > +name = "guestfs" > version = "0.1.0" > edition = "2018" > > [dependencies] > -libc = "0.2" > - In nbdkit we added Cargo.lock and Cargo.toml to .gitignore and we did *not* check them into git. > diff --git a/rust/tests/<a href="http://010_load.rs" rel="noreferrer" target="_blank">010_load.rs</a> b/rust/tests/<a href="http://010_load.rs" rel="noreferrer" target="_blank">010_load.rs</a> > new file mode 100644 > index 000000000..eadd78896 > --- /dev/null > +++ b/rust/tests/<a href="http://010_load.rs" rel="noreferrer" target="_blank">010_load.rs</a> > @@ -0,0 +1,24 @@ > +/* libguestfs Python bindings > + Copyright (C) 2009-2019 Red Hat Inc. > + > + This program is free software; you can redistribute it and/or modify > + it under the terms of the GNU General Public License as published by > + the Free Software Foundation; either version 2 of the License, or > + (at your option) any later version. > + > + This program is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + GNU General Public License for more details. > + > + You should have received a copy of the GNU General Public License > + along with this program; if not, write to the Free Software > + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. > + */ > + > +extern crate guestfs; > + > +#[test] > +fn load() { > + // nop > +} > diff --git a/rust/tests/<a href="http://020_create.rs" rel="noreferrer" target="_blank">020_create.rs</a> b/rust/tests/<a href="http://020_create.rs" rel="noreferrer" target="_blank">020_create.rs</a> > new file mode 100644 > index 000000000..0b57b19d7 > --- /dev/null > +++ b/rust/tests/<a href="http://020_create.rs" rel="noreferrer" target="_blank">020_create.rs</a> > @@ -0,0 +1,24 @@ > +/* libguestfs Python bindings > + Copyright (C) 2009-2019 Red Hat Inc. > + > + This program is free software; you can redistribute it and/or modify > + it under the terms of the GNU General Public License as published by > + the Free Software Foundation; either version 2 of the License, or > + (at your option) any later version. > + > + This program is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + GNU General Public License for more details. > + > + You should have received a copy of the GNU General Public License > + along with this program; if not, write to the Free Software > + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. > + */ > + > +extern crate guestfs; > + > +#[test] > +fn create() { > + assert!(!guestfs::Handle::create().is_err(), "create fail"); > +} > diff --git a/rust/tests/<a href="http://030_create_flags.rs" rel="noreferrer" target="_blank">030_create_flags.rs</a> b/rust/tests/<a href="http://030_create_flags.rs" rel="noreferrer" target="_blank">030_create_flags.rs</a> > new file mode 100644 > index 000000000..5de0589c1 > --- /dev/null > +++ b/rust/tests/<a href="http://030_create_flags.rs" rel="noreferrer" target="_blank">030_create_flags.rs</a> > @@ -0,0 +1,30 @@ > +/* libguestfs Python bindings > + Copyright (C) 2009-2019 Red Hat Inc. > + > + This program is free software; you can redistribute it and/or modify > + it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or > + (at your option) any later version. > + > + This program is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + GNU General Public License for more details. > + > + You should have received a copy of the GNU General Public License > + along with this program; if not, write to the Free Software > + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. > + */ > + > +extern crate guestfs; > + > +use guestfs::*; > + > +#[test] > +fn create_flags() { > + let _h = Handle::create_flags(CreateFlags::none()).expect("create_flags fail"); > + // TODO: Add parse_environment to check the flag is created correctly > + let flags = CreateFlags::new() > + .create_no_environment(true); > + let _h = Handle::create_flags(flags).expect("create_flags fail"); > + // TODO: Add parse_environment to check the flag is created correctly > +} > diff --git a/rust/tests/<a href="http://040_create_multiple.rs" rel="noreferrer" target="_blank">040_create_multiple.rs</a> b/rust/tests/<a href="http://040_create_multiple.rs" rel="noreferrer" target="_blank">040_create_multiple.rs</a> > new file mode 100644 > index 000000000..ee481c278 > --- /dev/null > +++ b/rust/tests/<a href="http://040_create_multiple.rs" rel="noreferrer" target="_blank">040_create_multiple.rs</a> > @@ -0,0 +1,38 @@ > +/* libguestfs Python bindings > + Copyright (C) 2009-2019 Red Hat Inc. > + > + This program is free software; you can redistribute it and/or modify > + it under the terms of the GNU General Public License as published by > + the Free Software Foundation; either version 2 of the License, or > + (at your option) any later version. > + > + This program is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + GNU General Public License for more details. > + > + You should have received a copy of the GNU General Public License > + along with this program; if not, write to the Free Software > + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. > + */ > + > +extern crate guestfs; > + > +fn create() -> guestfs::Handle { > + match guestfs::Handle::create() { > + Ok(g) => g, > + Err(e) => panic!("fail: {}", e), > + } > +} > + > +fn ignore(_x: guestfs::Handle, _y: guestfs::Handle, _z: guestfs::Handle) { > + // drop > +} > + > +#[test] > +fn create_multiple() { > + let x = create(); > + let y = create(); > + let z = create(); > + ignore(x, y, z) > +} > -- > 2.20.1 (Apple Git-117) The actual test parts of this patch are fine, but you need to spend a bit of time with ‘git rebase -i’ to move parts of patch 3 into patch 2. Rich. -- Richard Jones, Virtualization Group, Red Hat <a href="http://people.redhat.com/~rjones" rel="noreferrer" target="_blank">http://people.redhat.com/~rjones</a> Read my programming and virtualization blog: <a href="http://rwmj.wordpress.com" rel="noreferrer" target="_blank">http://rwmj.wordpress.com</a> virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and Windows. <a href="http://people.redhat.com/~rjones/virt-df/" rel="noreferrer" target="_blank">http://people.redhat.com/~rjones/virt-df/</a> </blockquote></div>