From 2879f441486800602b598fb16d45d4043524567c Mon Sep 17 00:00:00 2001 From: Jeb Rosen Date: Tue, 14 Jul 2020 11:01:42 -0700 Subject: [PATCH] Upgrade 'mysql' to 18.0 in 'contrib'. --- contrib/lib/Cargo.toml | 4 ++-- contrib/lib/src/databases.rs | 4 ++-- site/guide/6-state.md | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/lib/Cargo.toml b/contrib/lib/Cargo.toml index f9b2618e..da332d78 100644 --- a/contrib/lib/Cargo.toml +++ b/contrib/lib/Cargo.toml @@ -66,8 +66,8 @@ diesel = { version = "1.0", default-features = false, optional = true } postgres = { version = "0.17", optional = true } r2d2 = { version = "0.8", optional = true } r2d2_postgres = { version = "0.16", optional = true } -mysql = { version = "17.0", optional = true } -r2d2_mysql = { version = "17.0", optional = true } +mysql = { version = "18.0", optional = true } +r2d2_mysql = { version = "18.0", optional = true } rusqlite = { version = "0.16.0", optional = true } r2d2_sqlite = { version = "0.8", optional = true } rusted_cypher = { version = "1", optional = true } diff --git a/contrib/lib/src/databases.rs b/contrib/lib/src/databases.rs index 9ad58c52..9d5f0162 100644 --- a/contrib/lib/src/databases.rs +++ b/contrib/lib/src/databases.rs @@ -340,7 +340,7 @@ //! | Kind | Driver | Version | `Poolable` Type | Feature | //! |----------|-----------------------|-----------|--------------------------------|------------------------| //! | MySQL | [Diesel] | `1` | [`diesel::MysqlConnection`] | `diesel_mysql_pool` | -//! | MySQL | [`rust-mysql-simple`] | `17` | [`mysql::Conn`] | `mysql_pool` | +//! | MySQL | [`rust-mysql-simple`] | `18` | [`mysql::Conn`] | `mysql_pool` | //! | Postgres | [Diesel] | `1` | [`diesel::PgConnection`] | `diesel_postgres_pool` | //! | Postgres | [Rust-Postgres] | `0.17` | [`postgres::Client`] | `postgres_pool` | //! | Sqlite | [Diesel] | `1` | [`diesel::SqliteConnection`] | `diesel_sqlite_pool` | @@ -357,7 +357,7 @@ //! [`diesel::SqliteConnection`]: http://docs.diesel.rs/diesel/prelude/struct.SqliteConnection.html //! [`postgres::Client`]: https://docs.rs/postgres/0.17/postgres/struct.Client.html //! [`diesel::PgConnection`]: http://docs.diesel.rs/diesel/pg/struct.PgConnection.html -//! [`mysql::Conn`]: https://docs.rs/mysql/17/mysql/struct.Conn.html +//! [`mysql::Conn`]: https://docs.rs/mysql/18/mysql/struct.Conn.html //! [`diesel::MysqlConnection`]: http://docs.diesel.rs/diesel/mysql/struct.MysqlConnection.html //! [`redis-rs`]: https://github.com/mitsuhiko/redis-rs //! [`rusted_cypher`]: https://github.com/livioribeiro/rusted-cypher diff --git a/site/guide/6-state.md b/site/guide/6-state.md index c5638118..6f5dd672 100644 --- a/site/guide/6-state.md +++ b/site/guide/6-state.md @@ -230,7 +230,7 @@ Presently, Rocket provides built-in support for the following databases: | Kind | Driver | Version | `Poolable` Type | Feature | |----------|-----------------------|-----------|--------------------------------|------------------------| | MySQL | [Diesel] | `1` | [`diesel::MysqlConnection`] | `diesel_mysql_pool` | -| MySQL | [`rust-mysql-simple`] | `17` | [`mysql::Conn`] | `mysql_pool` | +| MySQL | [`rust-mysql-simple`] | `18` | [`mysql::Conn`] | `mysql_pool` | | Postgres | [Diesel] | `1` | [`diesel::PgConnection`] | `diesel_postgres_pool` | | Postgres | [Rust-Postgres] | `0.17` | [`postgres::Client`] | `postgres_pool` | | Sqlite | [Diesel] | `1` | [`diesel::SqliteConnection`] | `diesel_sqlite_pool` | @@ -248,7 +248,7 @@ Presently, Rocket provides built-in support for the following databases: [`diesel::SqliteConnection`]: http://docs.diesel.rs/diesel/prelude/struct.SqliteConnection.html [`postgres::Client`]: https://docs.rs/postgres/0.17/postgres/struct.Client.html [`diesel::PgConnection`]: http://docs.diesel.rs/diesel/pg/struct.PgConnection.html -[`mysql::Conn`]: https://docs.rs/mysql/17/mysql/struct.Conn.html +[`mysql::Conn`]: https://docs.rs/mysql/18/mysql/struct.Conn.html [`diesel::MysqlConnection`]: http://docs.diesel.rs/diesel/mysql/struct.MysqlConnection.html [`redis-rs`]: https://github.com/mitsuhiko/redis-rs [`rusted_cypher`]: https://github.com/livioribeiro/rusted-cypher