From 19562e5fdd336609418b3783dad9d5638873272a Mon Sep 17 00:00:00 2001 From: Zeeshan Ali Khan Date: Wed, 13 Dec 2023 22:27:50 +0100 Subject: [PATCH 1/3] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20=20zv:=20Fix=20a=20few?= =?UTF-8?q?=20typos=20in=20doc=20comments?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zvariant/src/serialized/data.rs | 4 ++-- zvariant/src/serialized/size.rs | 2 +- zvariant/src/serialized/written.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zvariant/src/serialized/data.rs b/zvariant/src/serialized/data.rs index cc1c288e1..c66392747 100644 --- a/zvariant/src/serialized/data.rs +++ b/zvariant/src/serialized/data.rs @@ -36,7 +36,7 @@ pub struct Inner<'bytes, 'fds> { } impl<'bytes, 'fds> Data<'bytes, 'fds> { - /// Create a new `EncodedBytes` instance containing borrowed file descriptors. + /// Create a new `Data` instance containing borrowed file descriptors. /// /// This method is only available on Unix platforms. #[cfg(unix)] @@ -334,7 +334,7 @@ impl<'bytes, 'fds> Data<'bytes, 'fds> { } impl<'bytes> Data<'bytes, 'static> { - /// Create a new `EncodedBytes` instance. + /// Create a new `Data` instance. pub fn new(bytes: T, context: Context) -> Self where T: Into>, diff --git a/zvariant/src/serialized/size.rs b/zvariant/src/serialized/size.rs index 804f06a0e..5a27b03c2 100644 --- a/zvariant/src/serialized/size.rs +++ b/zvariant/src/serialized/size.rs @@ -17,7 +17,7 @@ pub struct Size { } impl Size { - /// Create a new `EncodedSize` instance. + /// Create a new `Size` instance. pub fn new(size: usize, context: Context) -> Self { Self { size, diff --git a/zvariant/src/serialized/written.rs b/zvariant/src/serialized/written.rs index 678e46db9..97ccee1cb 100644 --- a/zvariant/src/serialized/written.rs +++ b/zvariant/src/serialized/written.rs @@ -19,7 +19,7 @@ pub struct Written { } impl Written { - /// Create a new `EncodedSize` instance. + /// Create a new `Written` instance. pub fn new(size: usize, context: Context) -> Self { Self { size, From 31134d6276b0cbb0dbb6133e48cba35cfda7ad99 Mon Sep 17 00:00:00 2001 From: Zeeshan Ali Khan Date: Wed, 13 Dec 2023 22:40:12 +0100 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=8E=A8=20zm:=20Fix=20formatting=20in?= =?UTF-8?q?=20a=20doc=20comment?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zbus_macros/src/iface.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zbus_macros/src/iface.rs b/zbus_macros/src/iface.rs index 1c55799d1..cbdff493e 100644 --- a/zbus_macros/src/iface.rs +++ b/zbus_macros/src/iface.rs @@ -408,8 +408,8 @@ pub fn expand(args: AttributeArgs, mut input: ItemImpl) -> syn::Result>` is required). // - // * For all other arg types, we convert the passed value to `OwnedValue` first and - // then pass it as `Value` (so `TryFrom` is required). + // * For all other arg types, we convert the passed value to `OwnedValue` first + // and then pass it as `Value` (so `TryFrom` is required). let value_to_owned = quote! { match ::zbus::zvariant::Value::try_to_owned(value) { ::std::result::Result::Ok(val) => ::zbus::zvariant::Value::from(val), From abbd284156a6cafbe9d747c7d22e971a0f811107 Mon Sep 17 00:00:00 2001 From: Zeeshan Ali Khan Date: Wed, 13 Dec 2023 22:38:04 +0100 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=92=9A=20CI:=20Install=20pkg-config?= =?UTF-8?q?=20from=20tpm's=20repo=20on=20Windows?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Hopefully this finally fixes the Windows CI being unable to download `pkg-config`. Fixes #441. --- .github/workflows/rust.yml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 3fb29d0f1..113a665c2 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -90,7 +90,8 @@ jobs: RUST_LOG: trace ErrorActionPreference: Stop WarningPreference: Stop - PKG_CONFIG_PATH: C:/lib/pkgconfig + PKG_CONFIG: C:\bin\pkg-config.exe + PKG_CONFIG_PATH: C:\lib\pkgconfig DBUS_SESSION_BUS_ADDRESS: tcp:host=127.0.0.1,port=9876 TRYBUILD: overwrite # ignore ui tests steps: @@ -107,6 +108,7 @@ jobs: c:/bin/xmlwf.exe c:/bin/*dbus* c:/lib/*dbus* + c:/bin/*pkg-config* c:/var/lib/*dbus* c:/lib/*glib* c:/lib/*gio* @@ -133,17 +135,20 @@ jobs: c:/bin/*intl* key: ${{ runner.os }}-cache - - name: Install pkg-config + - name: Install Meson and Ninja + if: steps.cache-deps.outputs.cache-hit != 'true' shell: pwsh - run: | - # This is needed for some reason: https://github.com/dbus2/zbus/actions/runs/4917893488/jobs/8783555606 - choco feature enable -n allowEmptyChecksums - choco install -y pkgconfiglite + run: pip3 install meson ninja - - name: Install Meson + - name: Install pkg-config if: steps.cache-deps.outputs.cache-hit != 'true' shell: pwsh - run: pip3 install meson + run: | + git clone --branch meson-glib-subproject --depth 1 https://gitlab.freedesktop.org/tpm/pkg-config.git + cd pkg-config + meson build -Dprefix=C:\ --buildtype release + ninja -C build + ninja -C build install - name: Setup MSVC Environment if: steps.cache-deps.outputs.cache-hit != 'true'