Skip to content

Commit

Permalink
Fix new beta warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
weiznich committed Nov 13, 2023
1 parent a748df9 commit 1819356
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 2 deletions.
1 change: 1 addition & 0 deletions diesel/src/connection/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,7 @@ pub(crate) mod private {

// These impls are only there for backward compatibility reasons
// Remove them on the next breaking release
#[allow(unreachable_pub)] // must be pub for the type def using this trait
#[cfg(all(feature = "with-deprecated", not(feature = "without-deprecated")))]
pub trait ConnectionHelperType<DB, B>: super::LoadConnection<B, Backend = DB> {
type Cursor<'conn, 'query>
Expand Down
2 changes: 1 addition & 1 deletion diesel/src/macros/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pub(crate) mod prelude {
allow(deprecated)
)]
// This is a false positive, we reexport it later
#[allow(unreachable_pub)]
#[allow(unreachable_pub, unused_imports)]
#[doc(inline)]
pub use crate::{
allow_columns_to_appear_in_same_group_by_clause, allow_tables_to_appear_in_same_query,
Expand Down
2 changes: 1 addition & 1 deletion diesel/src/query_builder/distinct_clause.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ impl<O> ValidOrderingForDistinct<NoDistinctClause> for O {}
impl<O> ValidOrderingForDistinct<DistinctClause> for O {}

// This is rexported from another location
#[allow(unreachable_pub)]
#[allow(unreachable_pub, unused_imports)]
#[cfg(feature = "postgres_backend")]
pub use crate::pg::DistinctOnClause;
2 changes: 2 additions & 0 deletions diesel/src/query_source/aliasing/alias.rs
Original file line number Diff line number Diff line change
Expand Up @@ -207,9 +207,11 @@ where
/// To be able to define `helper_types::Fields` with the usual conventions
///
/// This type is intentionally not publicly exported
#[allow(unreachable_pub)]
pub trait GetAliasSourceFromAlias {
type Source;
}

impl<S> GetAliasSourceFromAlias for Alias<S> {
type Source = S;
}
1 change: 1 addition & 0 deletions diesel/src/row.rs
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@ pub(crate) mod private {
// These impls are only there for backward compatibility reasons
// Remove them on the next breaking release
#[cfg(all(feature = "with-deprecated", not(feature = "without-deprecated")))]
#[allow(unreachable_pub)]
pub trait RowLifetimeHelper<DB>: for<'a> super::Row<'a, DB>
where
DB: Backend,
Expand Down
1 change: 1 addition & 0 deletions diesel_tests/tests/types_roundtrip.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ pub use quickcheck::quickcheck;
pub use crate::schema::{connection_without_transaction, TestConnection};
pub use diesel::data_types::*;
pub use diesel::result::Error;
#[cfg(not(feature = "postgres"))]
pub use diesel::serialize::ToSql;
pub use diesel::sql_types::{HasSqlType, SingleValue, SqlType};
pub use diesel::*;
Expand Down

0 comments on commit 1819356

Please sign in to comment.