Merge pull request diesel-rs#899 from diesel-rs/sg-move-expression-methods

Move expression_methods to a more doc-friendly location

Author: sgrif

diesel/src/expression/mod.rs

@@ -27,7 +27,6 @@ pub mod coerce;
 pub mod count;
 #[doc(hidden)]
 pub mod exists;
-pub mod expression_methods;
 #[doc(hidden)]
 #[macro_use]
 pub mod functions;

…ssion_methods/bool_expression_methods.rs …ssion_methods/bool_expression_methods.rsdiesel/src/expression/expression_methods/bool_expression_methods.rs renamed to diesel/src/expression_methods/bool_expression_methods.rs diesel/src/expression/expression_methods/bool_expression_methods.rs renamed to diesel/src/expression_methods/bool_expression_methods.rs

@@ -1,6 +1,6 @@
 use expression::Expression;
 use expression::predicates::And;
-use expression::expression_methods::*;
+use expression_methods::*;
 use types::Bool;
 
 /// This method is used by `FindDsl` to work with tuples. Because we cannot

…/expression/expression_methods/eq_all.rs diesel/src/expression_methods/eq_all.rsdiesel/src/expression/expression_methods/eq_all.rs renamed to diesel/src/expression_methods/eq_all.rs diesel/src/expression/expression_methods/eq_all.rs renamed to diesel/src/expression_methods/eq_all.rs

@@ -11,12 +11,17 @@ pub mod text_expression_methods;
 #[doc(hidden)]
 pub mod eq_all;
 
+#[doc(inline)]
 pub use self::bool_expression_methods::BoolExpressionMethods;
+#[doc(inline)]
 pub use self::escape_expression_methods::EscapeExpressionMethods;
+#[doc(inline)]
 pub use self::global_expression_methods::ExpressionMethods;
+#[doc(inline)]
 pub use self::text_expression_methods::TextExpressionMethods;
 #[doc(hidden)]
 pub use self::eq_all::EqAll;
 
 #[cfg(feature = "postgres")]
+#[doc(inline)]
 pub use pg::expression::expression_methods::*;

…ion_methods/escape_expression_methods.rs …ion_methods/escape_expression_methods.rsdiesel/src/expression/expression_methods/escape_expression_methods.rs renamed to diesel/src/expression_methods/escape_expression_methods.rs diesel/src/expression/expression_methods/escape_expression_methods.rs renamed to diesel/src/expression_methods/escape_expression_methods.rs

@@ -38,6 +38,7 @@ pub mod backend;
 pub mod connection;
 #[macro_use]
 pub mod expression;
+pub mod expression_methods;
 #[doc(hidden)]
 pub mod insertable;
 pub mod query_builder;
@@ -115,7 +116,7 @@ pub mod prelude {
     pub use associations::{GroupedBy, Identifiable};
     pub use connection::Connection;
     pub use expression::{Expression, SelectableExpression, AppearsOnTable, BoxableExpression};
-    pub use expression::expression_methods::*;
+    pub use expression_methods::*;
     #[doc(inline)]
     pub use insertable::Insertable;
     pub use query_dsl::*;

…ion_methods/global_expression_methods.rs …ion_methods/global_expression_methods.rsdiesel/src/expression/expression_methods/global_expression_methods.rs renamed to diesel/src/expression_methods/global_expression_methods.rs diesel/src/expression/expression_methods/global_expression_methods.rs renamed to diesel/src/expression_methods/global_expression_methods.rs

@@ -71,7 +71,7 @@ pub use self::migration_error::*;
 use std::fs::DirEntry;
 use std::io::{stdout, Write};
 
-use expression::expression_methods::*;
+use expression_methods::*;
 use query_dsl::*;
 use self::schema::__diesel_schema_migrations::dsl::*;
 use {Connection, QueryResult};

…src/expression/expression_methods/mod.rs diesel/src/expression_methods/mod.rsdiesel/src/expression/expression_methods/mod.rs renamed to diesel/src/expression_methods/mod.rs diesel/src/expression/expression_methods/mod.rs renamed to diesel/src/expression_methods/mod.rs

@@ -1,7 +1,7 @@
 use backend::Backend;
 use expression::*;
-use expression::expression_methods::*;
 use expression::predicates::And;
+use expression_methods::*;
 use result::QueryResult;
 use super::*;
 use types::Bool;