Merge pull request diesel-rs#1446 from martinlindhe/master

fix some typos, improve some language

Author: sgrif

CHANGELOG.md

@@ -131,7 +131,7 @@ for Rust libraries in [RFC #1105](https://github.com/rust-lang/rfcs/blob/master/
   use associated constants where appropriate.
 
 * You will now need to invoke `allow_tables_to_appear_in_same_query!` any time two tables
-  appear together in the same query, even if there is a `joinable!` invocationfor those tables.
+  appear together in the same query, even if there is a `joinable!` invocation for those tables.
 
 * `diesel_codegen` should no longer explicitly be used as a dependency. Unless
   you are using `infer_schema!` or `embed_migrations!`, you can simply remove it
@@ -742,7 +742,7 @@ for Rust libraries in [RFC #1105](https://github.com/rust-lang/rfcs/blob/master/
   instead of `env!("foo")` and `"dotenv:foo"` instead of `dotenv!("foo")`. The
   use of `dotenv` requires the `dotenv` feature on `diesel_codegen`, which is
   included by default. Using `env!` and `dotenv!` will no longer work with
-  `diesel_codegen`. They continue to work with `diesel_codgen_syntex`, but that
+  `diesel_codegen`. They continue to work with `diesel_codegen_syntex`, but that
   crate will be deprecated when Macros 1.1 is in the beta channel for Rust.
 
 [bash completion]: https://github.com/diesel-rs/diesel/blob/b1a0d9901f0f2a8c8d530ccba8173b57f332b891/diesel_cli/README.md#bash-completion
@@ -1148,7 +1148,7 @@ for Rust libraries in [RFC #1105](https://github.com/rust-lang/rfcs/blob/master/
 * `query_one`, `find`, and `first` now assume a single row is returned. For
   cases where you actually expect 0 or 1 rows to be returned, the `optional`
   method has been added to the result, in case having a `Result<Option<T>>` is
-  more ideomatic than checking for `Err(NotFound)`.
+  more idiomatic than checking for `Err(NotFound)`.
 
 ### Deprecated
 

diesel/src/macros/mod.rs

@@ -1086,7 +1086,7 @@ macro_rules! allow_tables_to_appear_in_same_query {
 }
 
 // The order of these modules is important (at least for those which have tests).
-// Utililty macros which don't call any others need to come first.
+// Utility macros which don't call any others need to come first.
 #[macro_use]
 mod internal;
 #[macro_use]

diesel/src/mysql/connection/raw.rs

@@ -189,12 +189,12 @@ impl Drop for RawConnection {
     }
 }
 
-/// > In a nonmulti-threaded environment, `mysql_init()` invokes
+/// > In a non-multi-threaded environment, `mysql_init()` invokes
 /// > `mysql_library_init()` automatically as necessary. However,
 /// > `mysql_library_init()` is not thread-safe in a multi-threaded environment,
 /// > and thus neither is `mysql_init()`. Before calling `mysql_init()`, either
 /// > call `mysql_library_init()` prior to spawning any threads, or use a mutex
-/// > ot protect the `mysql_library_init()` call. This should be done prior to
+/// > to protect the `mysql_library_init()` call. This should be done prior to
 /// > any other client library call.
 ///
 /// <https://dev.mysql.com/doc/refman/5.7/en/mysql-init.html>

diesel/src/pg/connection/result.rs

@@ -160,7 +160,7 @@ mod error_codes {
     //! These error codes are documented at
     //! <https://www.postgresql.org/docs/9.5/static/errcodes-appendix.html>
     //!
-    //! They are not exposed programatically through libpq.
+    //! They are not exposed programmatically through libpq.
     pub const UNIQUE_VIOLATION: &str = "23505";
     pub const FOREIGN_KEY_VIOLATION: &str = "23503";
 }

diesel/src/result.rs

@@ -69,7 +69,7 @@ pub enum Error {
 /// The kind of database error that occurred.
 ///
 /// This is not meant to exhaustively cover all possible errors, but is used to
-/// identify errors which are commonly recovered from programatically. This enum
+/// identify errors which are commonly recovered from programmatically. This enum
 /// is not intended to be exhaustively matched, and new variants may be added in
 /// the future without a major version bump.
 pub enum DatabaseErrorKind {

diesel/src/types/impls/floats.rs

@@ -36,7 +36,7 @@ impl<DB: Backend<RawValue = [u8]>> FromSql<types::Double, DB> for f64 {
         debug_assert!(
             bytes.len() <= 8,
             "Received more than 8 bytes while decoding \
-             an f64. Was a numeric accidentally marked as dobule?"
+             an f64. Was a numeric accidentally marked as double?"
         );
         bytes
             .read_f64::<DB::ByteOrder>()

diesel/src/types/mod.rs

@@ -476,7 +476,7 @@ pub trait FromSqlRow<A, DB: Backend + HasSqlType<A>>: Sized {
 //   - Specialization might also fix this one. The impl isn't quite a strict
 //     subset (the `FromSql` impl has `T: FromSql`, and the `FromSqlRow` impl
 //     has `T: FromSqlRow`), but if `FromSql` implies `FromSqlRow`,
-//     specialization might consdier that a subset?
+//     specialization might consider that a subset?
 // - I don't know that we really need it. `#[derive(FromSqlRow)]` is probably
 //   good enough. That won't improve our own codebase, since 99% of our
 //   `FromSqlRow` impls are for types from another crate, but it's almost

diesel_cli/README.md

@@ -52,7 +52,7 @@ DROP TABLE USERS;
 ```
 
 You can then run your new migration by running `diesel migration run`. Your
-DATABASE_URL must be set in order to run this command, and there are serveral
+DATABASE_URL must be set in order to run this command, and there are several
 ways that you can set it:
 
 * Set it as an environment variable manually

diesel_cli/src/database.rs

@@ -255,7 +255,7 @@ table! {
 fn pg_database_exists(conn: &PgConnection, database_name: &str) -> QueryResult<bool> {
     use self::pg_database::dsl::*;
 
-    pg_database.select(datname) // here come dat name!!!! o shit waddup!!!!
+    pg_database.select(datname)
         .filter(datname.eq(database_name))
         .filter(datistemplate.eq(false))
         .get_result::<String>(conn)

diesel_cli/tests/migration_generate.rs

@@ -43,7 +43,7 @@ Creating migrations.\\d{4}-\\d{2}-\\d{2}-\\d{6}_hello.down.sql\
 }
 
 #[test]
-fn migration_generate_creates_a_migration_with_initital_contents() {
+fn migration_generate_creates_a_migration_with_initial_contents() {
     let p = project("migration_name").folder("migrations").build();
     let result = p.command("migration").arg("generate").arg("hello").run();
     assert!(result.is_success(), "Command failed: {:?}", result);