diff --git a/CHANGELOG.md b/CHANGELOG.md index 97b0565043..cfeb889ec9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -723,7 +723,7 @@ Fix docs.rs build by enabling a runtime feature in the docs.rs metadata in `Carg - [[#256]] Add `query_unchecked!` and `query_file_unchecked!` with similar semantics to `query_as_unchecked!` [[@meh]] -- [[#252]] [[#297]] Derive serveral traits for the `Json` wrapper type [[@meh]] +- [[#252]] [[#297]] Derive several traits for the `Json` wrapper type [[@meh]] - [[#261]] Add support for `#[sqlx(rename_all = "snake_case")]` to `#[derive(Type)]` [[@shssoichiro]] @@ -1033,7 +1033,7 @@ Fix docs.rs build by enabling a runtime feature in the docs.rs metadata in `Carg included refactoring to make the pool internals less brittle (using RAII instead of manual work is one example) and to help any future contributors when changing the pool internals. -- Passwords are now being precent decoding before being presented to the server [[@repnop]] +- Passwords are now being percent-decoded before being presented to the server [[@repnop]] - [@100] Fix `FLOAT` and `DOUBLE` decoding in MySQL diff --git a/sqlx-bench/README.md b/sqlx-bench/README.md index ca21933631..f9903c748e 100644 --- a/sqlx-bench/README.md +++ b/sqlx-bench/README.md @@ -16,7 +16,7 @@ This Cargo project implements various benchmarks for SQLx using function calling and blocking on `Pool::acquire()`, a varying number of background tasks are also calling `acquire()` and holding the acquired connection for 500µs each before releasing it back to the pool. The pool is created with `.min_connections(50).max_connections(50)` so we shouldn't - be measuring anything but the actual overhead of `Pool`'s bookeeping. + be measuring anything but the actual overhead of `Pool`'s bookkeeping. ### Running diff --git a/sqlx-cli/README.md b/sqlx-cli/README.md index 18f4bcdeef..726ae33cd7 100644 --- a/sqlx-cli/README.md +++ b/sqlx-cli/README.md @@ -150,7 +150,7 @@ variable to `true`. If you want to make this the default, just add it to your `.env` file. `cargo sqlx prepare` will still do the right thing and connect to the database. -### Include queries behind feature flags (such as queryies inside of tests) +### Include queries behind feature flags (such as queries inside of tests) In order for sqlx to be able to find queries behind certain feature flags you need to turn them on by passing arguments to rustc. diff --git a/sqlx-cli/src/migration.rs b/sqlx-cli/src/migration.rs index fa2b70fbea..b69f6a83fc 100644 --- a/sqlx-cli/src/migration.rs +++ b/sqlx-cli/src/migration.rs @@ -88,7 +88,7 @@ pub async fn list() -> anyhow::Result<()> { .await? { let applied_migrations = migrator.get_migrations().await.unwrap_or_else(|_| { - println!("Could not retrive data from migration table"); + println!("Could not retrieve data from migration table"); Vec::new() }); diff --git a/sqlx-core/src/pool/inner.rs b/sqlx-core/src/pool/inner.rs index 4648805b65..ffbd69a89b 100644 --- a/sqlx-core/src/pool/inner.rs +++ b/sqlx-core/src/pool/inner.rs @@ -259,7 +259,7 @@ impl SharedPool { } } -// NOTE: Function names here are bizzare. Helpful help would be appreciated. +// NOTE: Function names here are bizarre. Helpful help would be appreciated. fn is_beyond_lifetime(live: &Live, options: &PoolOptions) -> bool { // check if connection was within max lifetime (or not set) diff --git a/sqlx-core/src/postgres/type_info.rs b/sqlx-core/src/postgres/type_info.rs index dbc5a4b7db..c6a96b58ee 100644 --- a/sqlx-core/src/postgres/type_info.rs +++ b/sqlx-core/src/postgres/type_info.rs @@ -220,7 +220,7 @@ impl PgTypeInfo { /// Create a `PgTypeInfo` from an OID. /// /// Note that the OID for a type is very dependent on the environment. If you only ever use - /// one database or if this is an unhandled build-in type, you should be fine. Otherwise, + /// one database or if this is an unhandled built-in type, you should be fine. Otherwise, /// you will be better served using [`with_name`](Self::with_name). pub const fn with_oid(oid: Oid) -> Self { Self(PgType::DeclareWithOid(oid)) diff --git a/sqlx-core/src/postgres/types/ltree.rs b/sqlx-core/src/postgres/types/ltree.rs index e6ef2d161c..a1e7c32563 100644 --- a/sqlx-core/src/postgres/types/ltree.rs +++ b/sqlx-core/src/postgres/types/ltree.rs @@ -15,7 +15,7 @@ use std::str::FromStr; #[non_exhaustive] pub enum PgLTreeParseError { /// LTree labels can only contain [A-Za-z0-9_] - #[error("ltree label cotains invalid characters")] + #[error("ltree label contains invalid characters")] InvalidLtreeLabel, /// LTree version not supported diff --git a/sqlx-core/src/sqlite/options/mod.rs b/sqlx-core/src/sqlite/options/mod.rs index d66b2bcff5..f9312d3499 100644 --- a/sqlx-core/src/sqlite/options/mod.rs +++ b/sqlx-core/src/sqlite/options/mod.rs @@ -137,7 +137,7 @@ impl SqliteConnectOptions { self } - /// Set the enforcement of [foreign key constriants](https://www.sqlite.org/pragma.html#pragma_foreign_keys). + /// Set the enforcement of [foreign key constraints](https://www.sqlite.org/pragma.html#pragma_foreign_keys). /// /// By default, this is enabled. pub fn foreign_keys(mut self, on: bool) -> Self { diff --git a/sqlx-macros/src/query/data.rs b/sqlx-macros/src/query/data.rs index dcce9c0bfe..a010f0b07d 100644 --- a/sqlx-macros/src/query/data.rs +++ b/sqlx-macros/src/query/data.rs @@ -119,7 +119,7 @@ pub mod offline { if query != query_data.query { return Err(format!( - "hash collision for stored queryies:\n{:?}\n{:?}", + "hash collision for stored queries:\n{:?}\n{:?}", query, query_data.query ) .into()); diff --git a/tests/postgres/postgres.rs b/tests/postgres/postgres.rs index 4c884b1744..f3d83d9b73 100644 --- a/tests/postgres/postgres.rs +++ b/tests/postgres/postgres.rs @@ -334,7 +334,7 @@ async fn it_can_query_scalar() -> anyhow::Result<()> { } #[sqlx_macros::test] -/// This is seperate from `it_can_query_scalar` because while implementing it I ran into a +/// This is separate from `it_can_query_scalar` because while implementing it I ran into a /// bug which that prevented `Vec` from compiling but allowed Vec>. async fn it_can_query_all_scalar() -> anyhow::Result<()> { let mut conn = new::().await?; diff --git a/tests/sqlite/sqlite.rs b/tests/sqlite/sqlite.rs index 474d3db576..e4a65989e5 100644 --- a/tests/sqlite/sqlite.rs +++ b/tests/sqlite/sqlite.rs @@ -456,7 +456,7 @@ async fn it_caches_statements() -> anyhow::Result<()> { assert_eq!(0, conn.cached_statements_size()); // `Query` is not persistent if `.persistent(false)` is used - // explicity. + // explicitly. let mut conn = new::().await?; for i in 0..2 { let row = sqlx::query("SELECT ? AS val")