Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typos #1894

Merged
merged 2 commits into from
Jun 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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<T>` wrapper type [[@meh]]
- [[#252]] [[#297]] Derive several traits for the `Json<T>` wrapper type [[@meh]]

- [[#261]] Add support for `#[sqlx(rename_all = "snake_case")]` to `#[derive(Type)]` [[@shssoichiro]]

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion sqlx-bench/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion sqlx-cli/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion sqlx-cli/src/migration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
});

Expand Down
2 changes: 1 addition & 1 deletion sqlx-core/src/pool/inner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ impl<DB: Database> SharedPool<DB> {
}
}

// 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<DB: Database>(live: &Live<DB>, options: &PoolOptions<DB>) -> bool {
// check if connection was within max lifetime (or not set)
Expand Down
2 changes: 1 addition & 1 deletion sqlx-core/src/postgres/type_info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion sqlx-core/src/postgres/types/ltree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sqlx-core/src/sqlite/options/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion sqlx-macros/src/query/data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion tests/postgres/postgres.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<i32>` from compiling but allowed Vec<Option<i32>>.
async fn it_can_query_all_scalar() -> anyhow::Result<()> {
let mut conn = new::<Postgres>().await?;
Expand Down
2 changes: 1 addition & 1 deletion tests/sqlite/sqlite.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::<Sqlite>().await?;
for i in 0..2 {
let row = sqlx::query("SELECT ? AS val")
Expand Down