On Fri, Oct 25, 2024 at 06:01:58PM +0200, Paolo Bonzini wrote: > Date: Fri, 25 Oct 2024 18:01:58 +0200 > From: Paolo Bonzini <pbonz...@redhat.com> > Subject: [PATCH 13/23] rust: synchronize dependencies between subprojects > and Cargo.lock > X-Mailer: git-send-email 2.47.0 > > The next commit will introduce a new build.rs dependency for rust/qemu-api, > version_check. Before adding it, ensure that all dependencies are > synchronized between the Meson- and cargo-based build systems. > > Note that it's not clear whether in the long term we'll use Cargo for > anything; it seems that the three main uses (clippy, rustfmt, rustdoc)
not sure whether cargo update could help to know if the dependenies can be updated or not... > can all be invoked manually---either via glue code in QEMU, or by > extending Meson to gain the relevant functionality. However, for > the time being we're stuck with Cargo so it should at least look at > the same code as the rest of the build system. > > Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> > --- > rust/hw/char/pl011/Cargo.lock | 3 +++ > rust/qemu-api-macros/Cargo.lock | 9 ++++--- > rust/qemu-api/Cargo.lock | 47 +++++++++++++++++++++++++++++++++ > rust/qemu-api/Cargo.toml | 1 + > 4 files changed, 56 insertions(+), 4 deletions(-) > > diff --git a/rust/hw/char/pl011/Cargo.lock b/rust/hw/char/pl011/Cargo.lock > index b58cebb186e..9f43b33e8b8 100644 > --- a/rust/hw/char/pl011/Cargo.lock > +++ b/rust/hw/char/pl011/Cargo.lock > @@ -91,6 +91,9 @@ dependencies = [ > [[package]] > name = "qemu_api" > version = "0.1.0" > +dependencies = [ > + "qemu_api_macros", > +] > > [[package]] > name = "qemu_api_macros" > diff --git a/rust/qemu-api-macros/Cargo.lock b/rust/qemu-api-macros/Cargo.lock > index fdc0fce116c..f989e25829f 100644 > --- a/rust/qemu-api-macros/Cargo.lock > +++ b/rust/qemu-api-macros/Cargo.lock > @@ -4,9 +4,9 @@ version = 3 > > [[package]] > name = "proc-macro2" > -version = "1.0.86" > +version = "1.0.84" > source = "registry+https://github.com/rust-lang/crates.io-index"; > -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" > +checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" > dependencies = [ > "unicode-ident", > ] > @@ -18,6 +18,7 @@ dependencies = [ > "proc-macro2", > "quote", > "syn", > + "unicode-ident", > ] With cargo build, it seems this dependency doesn't need to be added here. I compared the versions and checksums of the wrap files, and I also built it using cargo build based on this commit. The only change by Cargo is the one mentioned above; everything else looks good. With the nit fixed or otherwise, Reviewed-by: Zhao Liu <zhao1....@intel.com>
