Skip to content

Commit

Permalink
gio: Rename TlsConnectionManualExt to ExtManual and export from prelude
Browse files Browse the repository at this point in the history
Noticed in [1] that this trait has ManualExt written the wrong way
around, and is exported from the crate root instead of the prelude where
all other traits are reexported.

[1]: gtk-rs/gir#1111 (comment)
  • Loading branch information
MarijnS95 committed Apr 25, 2021
1 parent c72ce07 commit 6777f59
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
1 change: 0 additions & 1 deletion gio/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ pub use crate::read_input_stream::ReadInputStream;
mod write_output_stream;
pub use crate::write_output_stream::WriteOutputStream;
mod tls_connection;
pub use crate::tls_connection::TlsConnectionManualExt;

pub mod task;

Expand Down
1 change: 1 addition & 0 deletions gio/src/prelude.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ pub use crate::pollable_input_stream::PollableInputStreamExtManual;
pub use crate::pollable_output_stream::PollableOutputStreamExtManual;
pub use crate::settings::SettingsExtManual;
pub use crate::socket::*;
pub use crate::tls_connection::TlsConnectionExtManual;
#[cfg(any(unix, feature = "dox"))]
pub use crate::unix_input_stream::UnixInputStreamExtManual;
#[cfg(any(unix, feature = "dox"))]
Expand Down
4 changes: 2 additions & 2 deletions gio/src/tls_connection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use glib::IsA;
#[cfg(any(feature = "v2_66", feature = "dox"))]
use std::ptr;

pub trait TlsConnectionManualExt {
pub trait TlsConnectionExtManual {
#[cfg(any(feature = "v2_66", feature = "dox"))]
#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_66")))]
#[doc(alias = "g_tls_connection_get_channel_binding_data")]
Expand All @@ -19,7 +19,7 @@ pub trait TlsConnectionManualExt {
) -> Result<glib::ByteArray, glib::Error>;
}

impl<O: IsA<TlsConnection>> TlsConnectionManualExt for O {
impl<O: IsA<TlsConnection>> TlsConnectionExtManual for O {
#[cfg(any(feature = "v2_66", feature = "dox"))]
#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_66")))]
fn channel_binding_data(
Expand Down

0 comments on commit 6777f59

Please sign in to comment.