Skip to content

Commit

Permalink
Re-export CancelledHandlerId
Browse files Browse the repository at this point in the history
This type is effectively public, because it’s returned by
`Cancellable::connect_cancelled`, but because it’s not re-exported it
can’t be named, making it awkward to e.g. save it in a struct field.

Fixes GH-1649.
  • Loading branch information
Hawk777 committed Feb 10, 2025
1 parent 83d3161 commit 6844a2d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion gio/src/cancellable_future.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use std::{

use pin_project_lite::pin_project;

use crate::{cancellable::CancelledHandlerId, prelude::*, Cancellable, IOErrorEnum};
use crate::{prelude::*, Cancellable, CancelledHandlerId, IOErrorEnum};

Check failure on line 12 in gio/src/cancellable_future.rs

View workflow job for this annotation

GitHub Actions / build

unresolved import `crate::CancelledHandlerId`

Check failure on line 12 in gio/src/cancellable_future.rs

View workflow job for this annotation

GitHub Actions / build gtk-rs on Windows (gdk-pixbuf, true, --features v2_42)

unresolved import `crate::CancelledHandlerId`

Check failure on line 12 in gio/src/cancellable_future.rs

View workflow job for this annotation

GitHub Actions / build gtk-rs on Windows (pangocairo, true)

unresolved import `crate::CancelledHandlerId`

// rustdoc-stripper-ignore-next
/// Indicator that the [`CancellableFuture`] was cancelled.
Expand Down
2 changes: 1 addition & 1 deletion gio/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ pub use application::{ApplicationBusyGuard, ApplicationHoldGuard};
mod async_initable;
mod cancellable;
mod cancellable_future;
pub use crate::cancellable_future::{CancellableFuture, Cancelled};
pub use crate::cancellable_future::{CancellableFuture, Cancelled, CancelledHandlerId};

Check failure on line 23 in gio/src/lib.rs

View workflow job for this annotation

GitHub Actions / build

unresolved item import `CancelledHandlerId` is private

Check failure on line 23 in gio/src/lib.rs

View workflow job for this annotation

GitHub Actions / build gtk-rs on Windows (gdk-pixbuf, true, --features v2_42)

unresolved item import `CancelledHandlerId` is private

Check failure on line 23 in gio/src/lib.rs

View workflow job for this annotation

GitHub Actions / build gtk-rs on Windows (pangocairo, true)

unresolved item import `CancelledHandlerId` is private
mod converter;
mod credentials;
mod data_input_stream;
Expand Down

0 comments on commit 6844a2d

Please sign in to comment.