Fix building the repo with the default compiler (requires trybuild fo…

…rk for now)
Synphonyte · Jan 29, 2021 · ca34951 · ca34951
1 parent 428a80c
commit ca34951
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 31 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,6 @@ members = [
     "diesel",
     "diesel_cli",
     "diesel_derives",
-    "diesel_compile_tests",
     "diesel_tests",
     "diesel_migrations",
     "diesel_migrations/migrations_internals",

diff --git a/diesel_compile_tests/Cargo.toml b/diesel_compile_tests/Cargo.toml
@@ -5,4 +5,6 @@ authors = ["Sean Griffin <[email protected]>"]
 
 [dependencies]
 diesel = { version = "2.0.0", default-features = false, features = ["extras", "sqlite", "postgres", "mysql", "unstable"], path = "../diesel" }
-trybuild = "1.0.35"
+trybuild = {git = "https://github.com/weiznich/trybuild", rev = "44d736bc7872e92b513d581b009e52bddf940de1"}
+
+[workspace]
diff --git a/diesel_compile_tests/tests/fail/array_expressions_must_be_correct_type.stderr b/diesel_compile_tests/tests/fail/array_expressions_must_be_correct_type.stderr
@@ -4,7 +4,7 @@ error[E0277]: the trait bound `f64: diesel::SelectableExpression<()>` is not sat
 9   |     select(array((1f64, 3f64))).get_result::<Vec<i32>>(&connection);
     |     ^^^^^^ the trait `diesel::SelectableExpression<()>` is not implemented for `f64`
     |
-   ::: $WORKSPACE/diesel/src/query_builder/functions.rs:465:26
+   ::: $DIESEL/src/query_builder/functions.rs:465:26
     |
 465 |     SelectStatement<()>: SelectDsl<T>,
     |                          ------------ required by this bound in `diesel::select`
@@ -19,7 +19,7 @@ error[E0277]: the trait bound `f64: diesel::expression::ValidGrouping<()>` is no
 9   |     select(array((1f64, 3f64))).get_result::<Vec<i32>>(&connection);
     |     ^^^^^^ the trait `diesel::expression::ValidGrouping<()>` is not implemented for `f64`
     |
-   ::: $WORKSPACE/diesel/src/query_builder/functions.rs:465:26
+   ::: $DIESEL/src/query_builder/functions.rs:465:26
     |
 465 |     SelectStatement<()>: SelectDsl<T>,
     |                          ------------ required by this bound in `diesel::select`
@@ -82,7 +82,7 @@ error[E0277]: the trait bound `f64: diesel::Expression` is not satisfied
 9  |     select(array((1f64, 3f64))).get_result::<Vec<i32>>(&connection);
    |            ^^^^^ the trait `diesel::Expression` is not implemented for `f64`
    |
-  ::: $WORKSPACE/diesel/src/pg/expression/array.rs:51:8
+  ::: $DIESEL/src/pg/expression/array.rs:51:8
    |
 51 |     T: AsExpressionList<ST>,
    |        -------------------- required by this bound in `diesel::dsl::array`

diff --git a/diesel_compile_tests/tests/fail/array_expressions_must_be_same_type.stderr b/diesel_compile_tests/tests/fail/array_expressions_must_be_same_type.stderr
@@ -4,9 +4,9 @@ error[E0277]: the trait bound `f64: diesel::SelectableExpression<()>` is not sat
 11  |     select(array((1, 3f64))).get_result::<Vec<i32>>(&connection).unwrap();
     |     ^^^^^^ the trait `diesel::SelectableExpression<()>` is not implemented for `f64`
     |
-   ::: $WORKSPACE/diesel/src/query_builder/functions.rs
+   ::: $DIESEL/src/query_builder/functions.rs:465:26
     |
-    |     SelectStatement<()>: SelectDsl<T>,
+465 |     SelectStatement<()>: SelectDsl<T>,
     |                          ------------ required by this bound in `diesel::select`
     |
     = note: required because of the requirements on the impl of `diesel::SelectableExpression<()>` for `(diesel::expression::bound::Bound<diesel::sql_types::Integer, i32>, f64)`
@@ -19,9 +19,9 @@ error[E0277]: the trait bound `f64: diesel::expression::ValidGrouping<()>` is no
 11  |     select(array((1, 3f64))).get_result::<Vec<i32>>(&connection).unwrap();
     |     ^^^^^^ the trait `diesel::expression::ValidGrouping<()>` is not implemented for `f64`
     |
-   ::: $WORKSPACE/diesel/src/query_builder/functions.rs
+   ::: $DIESEL/src/query_builder/functions.rs:465:26
     |
-    |     SelectStatement<()>: SelectDsl<T>,
+465 |     SelectStatement<()>: SelectDsl<T>,
     |                          ------------ required by this bound in `diesel::select`
     |
     = note: required because of the requirements on the impl of `diesel::expression::ValidGrouping<()>` for `(diesel::expression::bound::Bound<diesel::sql_types::Integer, i32>, f64)`
@@ -82,9 +82,9 @@ error[E0277]: the trait bound `f64: diesel::Expression` is not satisfied
 11 |     select(array((1, 3f64))).get_result::<Vec<i32>>(&connection).unwrap();
    |            ^^^^^ the trait `diesel::Expression` is not implemented for `f64`
    |
-  ::: $WORKSPACE/diesel/src/pg/expression/array.rs
+  ::: $DIESEL/src/pg/expression/array.rs:51:8
    |
-   |     T: AsExpressionList<ST>,
+51 |     T: AsExpressionList<ST>,
    |        -------------------- required by this bound in `diesel::dsl::array`
    |
    = note: required because of the requirements on the impl of `diesel::expression::AsExpression<diesel::sql_types::Integer>` for `f64`
@@ -96,9 +96,9 @@ error[E0277]: the trait bound `{integer}: diesel::SelectableExpression<()>` is n
 12  |     select(array((1, 3f64))).get_result::<Vec<f64>>(&connection).unwrap();
     |     ^^^^^^ the trait `diesel::SelectableExpression<()>` is not implemented for `{integer}`
     |
-   ::: $WORKSPACE/diesel/src/query_builder/functions.rs
+   ::: $DIESEL/src/query_builder/functions.rs:465:26
     |
-    |     SelectStatement<()>: SelectDsl<T>,
+465 |     SelectStatement<()>: SelectDsl<T>,
     |                          ------------ required by this bound in `diesel::select`
     |
     = help: the following implementations were found:
@@ -117,9 +117,9 @@ error[E0277]: the trait bound `{integer}: diesel::expression::ValidGrouping<()>`
 12  |     select(array((1, 3f64))).get_result::<Vec<f64>>(&connection).unwrap();
     |     ^^^^^^ the trait `diesel::expression::ValidGrouping<()>` is not implemented for `{integer}`
     |
-   ::: $WORKSPACE/diesel/src/query_builder/functions.rs
+   ::: $DIESEL/src/query_builder/functions.rs:465:26
     |
-    |     SelectStatement<()>: SelectDsl<T>,
+465 |     SelectStatement<()>: SelectDsl<T>,
     |                          ------------ required by this bound in `diesel::select`
     |
     = help: the following implementations were found:
@@ -210,9 +210,9 @@ error[E0277]: the trait bound `{integer}: diesel::Expression` is not satisfied
 12 |     select(array((1, 3f64))).get_result::<Vec<f64>>(&connection).unwrap();
    |            ^^^^^ the trait `diesel::Expression` is not implemented for `{integer}`
    |
-  ::: $WORKSPACE/diesel/src/pg/expression/array.rs
+  ::: $DIESEL/src/pg/expression/array.rs:51:8
    |
-   |     T: AsExpressionList<ST>,
+51 |     T: AsExpressionList<ST>,
    |        -------------------- required by this bound in `diesel::dsl::array`
    |
    = help: the following implementations were found:

diff --git a/...ompile_tests/tests/fail/cannot_update_target_with_methods_other_than_filter_called.stderr b/...ompile_tests/tests/fail/cannot_update_target_with_methods_other_than_filter_called.stderr
@@ -4,9 +4,9 @@ error[E0277]: the trait bound `diesel::query_builder::SelectStatement<users::tab
 15 |     let command = update(users.select(id)).set(id.eq(1));
    |                          ^^^^^^^^^^^^^^^^ the trait `diesel::Identifiable` is not implemented for `diesel::query_builder::SelectStatement<users::table, diesel::query_builder::select_clause::SelectClause<users::columns::id>>`
    |
-  ::: $WORKSPACE/diesel/src/query_builder/functions.rs
+  ::: $DIESEL/src/query_builder/functions.rs:78:18
    |
-   | pub fn update<T: IntoUpdateTarget>(source: T) -> UpdateStatement<T::Table, T::WhereClause> {
+78 | pub fn update<T: IntoUpdateTarget>(source: T) -> UpdateStatement<T::Table, T::WhereClause> {
    |                  ---------------- required by this bound in `diesel::update`
    |
    = note: required because of the requirements on the impl of `diesel::query_builder::IntoUpdateTarget` for `diesel::query_builder::SelectStatement<users::table, diesel::query_builder::select_clause::SelectClause<users::columns::id>>`
@@ -17,9 +17,9 @@ error[E0277]: the trait bound `diesel::query_builder::SelectStatement<users::tab
 16 |     let command = update(users.order(id)).set(id.eq(1));
    |                          ^^^^^^^^^^^^^^^ the trait `diesel::Identifiable` is not implemented for `diesel::query_builder::SelectStatement<users::table, diesel::query_builder::select_clause::DefaultSelectClause, diesel::query_builder::distinct_clause::NoDistinctClause, diesel::query_builder::where_clause::NoWhereClause, diesel::query_builder::order_clause::OrderClause<users::columns::id>>`
    |
-  ::: $WORKSPACE/diesel/src/query_builder/functions.rs
+  ::: $DIESEL/src/query_builder/functions.rs:78:18
    |
-   | pub fn update<T: IntoUpdateTarget>(source: T) -> UpdateStatement<T::Table, T::WhereClause> {
+78 | pub fn update<T: IntoUpdateTarget>(source: T) -> UpdateStatement<T::Table, T::WhereClause> {
    |                  ---------------- required by this bound in `diesel::update`
    |
    = note: required because of the requirements on the impl of `diesel::query_builder::IntoUpdateTarget` for `diesel::query_builder::SelectStatement<users::table, diesel::query_builder::select_clause::DefaultSelectClause, diesel::query_builder::distinct_clause::NoDistinctClause, diesel::query_builder::where_clause::NoWhereClause, diesel::query_builder::order_clause::OrderClause<users::columns::id>>`

diff --git a/diesel_compile_tests/tests/fail/ordering_functions_require_ord.stderr b/diesel_compile_tests/tests/fail/ordering_functions_require_ord.stderr
@@ -4,9 +4,9 @@ error[E0277]: the trait bound `diesel::sql_types::Bool: diesel::sql_types::SqlOr
 13 |     let source = stuff::table.select(max(stuff::b));
    |                                      ^^^ the trait `diesel::sql_types::SqlOrd` is not implemented for `diesel::sql_types::Bool`
    |
-  ::: $WORKSPACE/diesel/src/expression/functions/aggregate_ordering.rs
+  ::: $DIESEL/src/expression/functions/aggregate_ordering.rs:32:16
    |
-   |     fn max<ST: SqlOrdAggregate>(expr: ST) -> ST::Ret;
+32 |     fn max<ST: SqlOrdAggregate>(expr: ST) -> ST::Ret;
    |                --------------- required by this bound in `diesel::dsl::max`
    |
    = note: required because of the requirements on the impl of `diesel::dsl::SqlOrdAggregate` for `diesel::sql_types::Bool`
@@ -27,9 +27,9 @@ error[E0277]: the trait bound `diesel::sql_types::Bool: diesel::sql_types::SqlOr
 14 |     let source = stuff::table.select(min(stuff::b));
    |                                      ^^^ the trait `diesel::sql_types::SqlOrd` is not implemented for `diesel::sql_types::Bool`
    |
-  ::: $WORKSPACE/diesel/src/expression/functions/aggregate_ordering.rs
+  ::: $DIESEL/src/expression/functions/aggregate_ordering.rs:51:16
    |
-   |     fn min<ST: SqlOrdAggregate>(expr: ST) -> ST::Ret;
+51 |     fn min<ST: SqlOrdAggregate>(expr: ST) -> ST::Ret;
    |                --------------- required by this bound in `diesel::dsl::min`
    |
    = note: required because of the requirements on the impl of `diesel::dsl::SqlOrdAggregate` for `diesel::sql_types::Bool`

diff --git a/...el_compile_tests/tests/fail/pg_specific_expressions_cant_be_used_in_a_sqlite_query.stderr b/...el_compile_tests/tests/fail/pg_specific_expressions_cant_be_used_in_a_sqlite_query.stderr
@@ -28,9 +28,9 @@ error[E0599]: no method named `execute` found for struct `diesel::upsert::Incomp
 34  |         .execute(&connection);
     |          ^^^^^^^ method not found in `diesel::upsert::IncompleteOnConflict<diesel::query_builder::InsertStatement<users::table, diesel::query_builder::ValuesClause<(diesel::insertable::ColumnInsertValue<users::columns::name, diesel::expression::bound::Bound<diesel::sql_types::Text, &&str>>,), users::table>>, diesel::query_builder::upsert::on_conflict_target::ConflictTarget<diesel::upsert::OnConstraint<'_>>>`
     |
-   ::: $WORKSPACE/diesel/src/upsert/on_conflict_extension.rs
+   ::: $DIESEL/src/upsert/on_conflict_extension.rs:222:1
     |
-    | pub struct IncompleteOnConflict<Stmt, Target> {
+222 | pub struct IncompleteOnConflict<Stmt, Target> {
     | ---------------------------------------------
     | |
     | doesn't satisfy `_: diesel::RunQueryDsl<_>`

diff --git a/diesel_compile_tests/tests/fail/pg_upsert_do_update_requires_valid_update.stderr b/diesel_compile_tests/tests/fail/pg_upsert_do_update_requires_valid_update.stderr
@@ -4,9 +4,9 @@ error[E0599]: no method named `execute` found for struct `diesel::upsert::Incomp
 37  |         .execute(&connection);
     |          ^^^^^^^ method not found in `diesel::upsert::IncompleteDoUpdate<diesel::query_builder::InsertStatement<users::table, diesel::query_builder::ValuesClause<(diesel::insertable::ColumnInsertValue<users::columns::name, diesel::expression::bound::Bound<diesel::sql_types::Text, &&str>>,), users::table>>, diesel::query_builder::upsert::on_conflict_target::ConflictTarget<users::columns::id>>`
     |
-   ::: $WORKSPACE/diesel/src/upsert/on_conflict_extension.rs
+   ::: $DIESEL/src/upsert/on_conflict_extension.rs:369:1
     |
-    | pub struct IncompleteDoUpdate<Stmt, Target> {
+369 | pub struct IncompleteDoUpdate<Stmt, Target> {
     | -------------------------------------------
     | |
     | doesn't satisfy `_: diesel::RunQueryDsl<_>`

diff --git a/diesel_compile_tests/tests/fail/update_requires_valid_where_clause.stderr b/diesel_compile_tests/tests/fail/update_requires_valid_where_clause.stderr
@@ -4,9 +4,9 @@ error[E0277]: the trait bound `diesel::query_builder::SelectStatement<users::tab
 21 |     update(users::table.filter(posts::id.eq(1)));
    |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `diesel::query_builder::IntoUpdateTarget` is not implemented for `diesel::query_builder::SelectStatement<users::table, diesel::query_builder::select_clause::DefaultSelectClause, diesel::query_builder::distinct_clause::NoDistinctClause, diesel::query_builder::where_clause::WhereClause<diesel::expression::grouped::Grouped<diesel::expression::operators::Eq<posts::columns::id, diesel::expression::bound::Bound<diesel::sql_types::Integer, i32>>>>>`
    |
-  ::: $WORKSPACE/diesel/src/query_builder/functions.rs
+  ::: $DIESEL/src/query_builder/functions.rs:78:18
    |
-   | pub fn update<T: IntoUpdateTarget>(source: T) -> UpdateStatement<T::Table, T::WhereClause> {
+78 | pub fn update<T: IntoUpdateTarget>(source: T) -> UpdateStatement<T::Table, T::WhereClause> {
    |                  ---------------- required by this bound in `diesel::update`
    |
    = help: the following implementations were found: