Skip to content

Commit 170da20

Browse files
committed
revert changes
1 parent e103973 commit 170da20

3 files changed

Lines changed: 2 additions & 16 deletions

File tree

diesel/src/lib.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -183,12 +183,6 @@ mod util;
183183
#[deprecated(since = "2.0.0", note = "Use explicit macro imports instead")]
184184
pub use diesel_derives::*;
185185

186-
#[doc(hidden)]
187-
pub type RealBool = bool;
188-
189-
#[doc(hidden)]
190-
pub type RealStr = &'static str;
191-
192186
pub mod dsl {
193187
//! Includes various helper types and bare functions which are named too
194188
//! generically to be included in prelude, but are often used when using Diesel.

diesel/src/macros/mod.rs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ macro_rules! __diesel_column {
9696
impl $crate::query_source::Column for $column_name {
9797
type Table = $table;
9898

99-
const NAME: $crate::RealStr = $sql_name;
99+
const NAME: &'static str = $sql_name;
100100
}
101101

102102
impl<T> $crate::EqAll<T> for $column_name where
@@ -1085,14 +1085,6 @@ mod tests {
10851085
pub struct MyCustomType;
10861086
}
10871087

1088-
table! {
1089-
table_with_primitive_type_names {
1090-
id -> Integer,
1091-
bool -> Bool,
1092-
str -> Text,
1093-
}
1094-
}
1095-
10961088
table! {
10971089
use crate::sql_types::*;
10981090
use crate::macros::tests::my_types::*;

diesel_derives/src/query_id.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pub fn derive(mut item: syn::DeriveInput) -> Result<proc_macro2::TokenStream, Di
3131
{
3232
type QueryId = #struct_name<#(#lifetimes,)* #(#query_id_ty_params,)*>;
3333

34-
const HAS_STATIC_QUERY_ID: diesel::RealBool = #(#has_static_query_id &&)* true;
34+
const HAS_STATIC_QUERY_ID: bool = #(#has_static_query_id &&)* true;
3535
}
3636
}))
3737
}

0 commit comments

Comments
 (0)