Skip to content

Commit

Permalink
Merge pull request #3969 from weiznich/bump/1.77
Browse files Browse the repository at this point in the history
Bump toolchain to 1.77
  • Loading branch information
weiznich authored Mar 25, 2024
2 parents a7ba787 + 12681df commit 877611a
Show file tree
Hide file tree
Showing 13 changed files with 4 additions and 17 deletions.
1 change: 0 additions & 1 deletion diesel/src/pg/query_builder/tablesample.rs
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@ where
mod test {
use super::*;
use crate::backend::Backend;
use crate::pg::Pg;
use crate::query_builder::QueryBuilder;
use diesel::dsl::*;
use diesel::*;
Expand Down
1 change: 0 additions & 1 deletion diesel/src/sqlite/connection/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ use self::raw::RawConnection;
use self::statement_iterator::*;
use self::stmt::{Statement, StatementUse};
use super::SqliteAggregateFunction;
use crate::connection::instrumentation::InstrumentationEvent;
use crate::connection::instrumentation::StrQueryHelper;
use crate::connection::statement_cache::StatementCache;
use crate::connection::*;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ extern crate diesel;
extern crate diesel_dynamic_schema;

use diesel::sql_types::{Integer, Text};
use diesel::sqlite::SqliteConnection;
use diesel::*;
use diesel_dynamic_schema::table;

Expand Down
1 change: 0 additions & 1 deletion diesel_dynamic_schema/examples/querying_basic_schemas.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ extern crate diesel;
extern crate diesel_dynamic_schema;

use diesel::sql_types::Integer;
use diesel::sqlite::SqliteConnection;
use diesel::*;
use diesel_dynamic_schema::table;

Expand Down
1 change: 0 additions & 1 deletion diesel_dynamic_schema/examples/querying_multiple_types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ extern crate diesel;
extern crate diesel_dynamic_schema;

use diesel::sql_types::{Integer, Text};
use diesel::sqlite::SqliteConnection;
use diesel::*;
use diesel_dynamic_schema::table;

Expand Down
5 changes: 1 addition & 4 deletions diesel_dynamic_schema/src/column.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
use diesel::backend::Backend;
use diesel::expression::{
is_aggregate, AppearsOnTable, Expression, SelectableExpression, TypedExpressionType,
ValidGrouping,
};
use diesel::expression::{is_aggregate, TypedExpressionType, ValidGrouping};
use diesel::prelude::*;
use diesel::query_builder::*;
use std::borrow::Borrow;
Expand Down
1 change: 0 additions & 1 deletion diesel_dynamic_schema/src/table.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ use diesel::expression::expression_types;
use diesel::internal::table_macro::{FromClause, SelectStatement};
use diesel::prelude::*;
use diesel::query_builder::*;
use diesel::query_source::QuerySource;
use std::borrow::Borrow;

use crate::column::Column;
Expand Down
4 changes: 2 additions & 2 deletions diesel_tests/tests/custom_types.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use crate::schema::*;
use diesel::connection::SimpleConnection;
use diesel::deserialize::{self, FromSql};
use diesel::deserialize::FromSql;
use diesel::pg::{Pg, PgValue};
use diesel::serialize::{self, IsNull, Output, ToSql};
use diesel::serialize::{IsNull, Output, ToSql};
use diesel::*;
use std::io::Write;

Expand Down
1 change: 0 additions & 1 deletion diesel_tests/tests/only.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use crate::schema::connection;
use diesel::dsl::*;
use diesel::pg::expression::dsl::OnlyDsl;
use diesel::prelude::*;

// The reason we declare tables specifically for these tests, is that we test inheritance and thus
Expand Down
1 change: 0 additions & 1 deletion examples/postgres/composite_types/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
pub mod schema;

use diesel::pg::PgConnection;
use diesel::prelude::*;
use dotenvy::dotenv;
use std::env;
Expand Down
1 change: 0 additions & 1 deletion examples/postgres/getting_started_step_1/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
pub mod models;
pub mod schema;

use diesel::pg::PgConnection;
use diesel::prelude::*;
use dotenvy::dotenv;
use std::env;
Expand Down
1 change: 0 additions & 1 deletion examples/postgres/relations/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use diesel::pg::PgConnection;
use diesel::prelude::*;
use dotenvy::dotenv;
use std::env;
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.76.0
1.77.0

0 comments on commit 877611a

Please sign in to comment.