Skip to content

Commit 0760ee5

Browse files
committed
chore: set rust-version to 1.85 for all crates
1 parent 0ac66ea commit 0760ee5

File tree

13 files changed

+16
-11
lines changed

13 files changed

+16
-11
lines changed

Cargo.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ members = [
2525
[workspace.package]
2626
version = "0.9.0-alpha.1"
2727
license = "MIT OR Apache-2.0"
28+
# TODO: upgrade to edition 2024 (after merging all pending PRs)
2829
edition = "2021"
2930
repository = "https://github.com/launchbadge/sqlx"
3031
keywords = ["database", "async", "postgres", "mysql", "sqlite"]
@@ -35,8 +36,7 @@ authors = [
3536
"Chloe Ross <[email protected]>",
3637
"Daniel Akhterov <[email protected]>",
3738
]
38-
# TODO: enable this for 0.9.0
39-
# rust-version = "1.80.0"
39+
rust-version = "1.85.0"
4040

4141
[package]
4242
name = "sqlx"
@@ -48,6 +48,7 @@ license.workspace = true
4848
edition.workspace = true
4949
authors.workspace = true
5050
repository.workspace = true
51+
rust-version.workspace = true
5152

5253
[package.metadata.docs.rs]
5354
features = ["all-databases", "_unstable-all-types", "sqlite-preupdate-hook"]

rust-toolchain.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Note: should NOT increase during a minor/patch release cycle
22
[toolchain]
3-
channel = "1.78"
3+
channel = "1.85"
44
profile = "minimal"

sqlx-cli/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ authors = [
1414
"Jesper Axelsson <[email protected]>",
1515
"Austin Bonander <[email protected]>",
1616
]
17+
rust-version.workspace = true
1718

1819
[[bin]]
1920
name = "sqlx"

sqlx-core/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ license.workspace = true
66
edition.workspace = true
77
authors.workspace = true
88
repository.workspace = true
9+
rust-version.workspace = true
910

1011
[package.metadata.docs.rs]
1112
features = ["offline"]

sqlx-core/src/query.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ where
499499
/// Execute a single SQL query as a prepared statement (explicitly created).
500500
pub fn query_statement<'q, DB>(
501501
statement: &'q DB::Statement<'q>,
502-
) -> Query<'q, DB, <DB as Database>::Arguments<'_>>
502+
) -> Query<'q, DB, <DB as Database>::Arguments<'q>>
503503
where
504504
DB: Database,
505505
{

sqlx-core/src/query_as.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ where
386386
// Make a SQL query from a statement, that is mapped to a concrete type.
387387
pub fn query_statement_as<'q, DB, O>(
388388
statement: &'q DB::Statement<'q>,
389-
) -> QueryAs<'q, DB, O, <DB as Database>::Arguments<'_>>
389+
) -> QueryAs<'q, DB, O, <DB as Database>::Arguments<'q>>
390390
where
391391
DB: Database,
392392
O: for<'r> FromRow<'r, DB::Row>,

sqlx-core/src/query_scalar.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ where
365365
// Make a SQL query from a statement, that is mapped to a concrete value.
366366
pub fn query_statement_scalar<'q, DB, O>(
367367
statement: &'q DB::Statement<'q>,
368-
) -> QueryScalar<'q, DB, O, <DB as Database>::Arguments<'_>>
368+
) -> QueryScalar<'q, DB, O, <DB as Database>::Arguments<'q>>
369369
where
370370
DB: Database,
371371
(O,): for<'r> FromRow<'r, DB::Row>,

sqlx-macros-core/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ license.workspace = true
66
edition.workspace = true
77
authors.workspace = true
88
repository.workspace = true
9+
rust-version.workspace = true
910

1011
[features]
1112
default = []

sqlx-macros/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ license.workspace = true
66
edition.workspace = true
77
authors.workspace = true
88
repository.workspace = true
9+
rust-version.workspace = true
910

1011
[lib]
1112
proc-macro = true

sqlx-mysql/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ license.workspace = true
77
edition.workspace = true
88
authors.workspace = true
99
repository.workspace = true
10-
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
10+
rust-version.workspace = true
1111

1212
[features]
1313
json = ["sqlx-core/json", "serde"]

sqlx-postgres/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ license.workspace = true
77
edition.workspace = true
88
authors.workspace = true
99
repository.workspace = true
10-
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
10+
rust-version.workspace = true
1111

1212
[features]
1313
any = ["sqlx-core/any"]

sqlx-sqlite/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ license.workspace = true
77
edition.workspace = true
88
authors.workspace = true
99
repository.workspace = true
10-
11-
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
10+
rust-version.workspace = true
1211

1312
[features]
1413
any = ["sqlx-core/any"]

sqlx-test/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
[package]
22
name = "sqlx-test"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition.workspace = true
55
publish = false
6+
rust-version.workspace = true
67

78
[dependencies]
89
sqlx = { default-features = false, path = ".." }

0 commit comments

Comments
 (0)