Skip to content

Commit ce82995

Browse files
Eijebongkillercup
authored andcommitted
Fix some typos here and there
1 parent f9ecb43 commit ce82995

10 files changed

Lines changed: 14 additions & 14 deletions

File tree

diesel/src/connection/transaction_manager.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ pub trait TransactionManager<Conn: Connection> {
1717
/// increment the transaction depth by 1.
1818
fn begin_transaction(&self, conn: &Conn) -> QueryResult<()>;
1919

20-
/// Rollback the inner-most transcation. If the transaction depth is greater
20+
/// Rollback the inner-most transaction. If the transaction depth is greater
2121
/// than 1, this should rollback to the most recent savepoint. This function
2222
/// is expected to decrement the transaction depth by 1.
2323
fn rollback_transaction(&self, conn: &Conn) -> QueryResult<()>;
2424

25-
/// Commit the inner-most transcation. If the transaction depth is greater
25+
/// Commit the inner-most transaction. If the transaction depth is greater
2626
/// than 1, this should release the most recent savepoint. This function is
2727
/// expected to decrement the transaction depth by 1.
2828
fn commit_transaction(&self, conn: &Conn) -> QueryResult<()>;

diesel/src/expression_methods/bool_expression_methods.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pub trait BoolExpressionMethods: Expression<SqlType=Bool> + Sized {
1111

1212
/// Creates a SQL `OR` expression
1313
///
14-
/// The result will be wrapped in parenthesis, so that precidence matches
14+
/// The result will be wrapped in parenthesis, so that precedence matches
1515
/// that of your function calls. For example, `false.and(true.or(false))`
1616
/// will return `false`
1717
fn or<T: AsExpression<Bool>>(self, other: T) -> Grouped<Or<Self, T::Expression>> {

diesel/src/insertable.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use result::QueryResult;
55
use query_builder::AstPass;
66
use query_source::Table;
77

8-
/// Represents that a structure can be used to to insert a new row into the
8+
/// Represents that a structure can be used to insert a new row into the
99
/// database. This is automatically implemented for `&[T]` and `&Vec<T>` for
1010
/// inserting more than one record.
1111
///

diesel/src/macros/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ macro_rules! table_body {
600600
/// The SQL type of all of the columns on this table
601601
pub type SqlType = ($($($column_ty)*,)+);
602602

603-
/// Helper type for reperesenting a boxed query from this table
603+
/// Helper type for representing a boxed query from this table
604604
pub type BoxedQuery<'a, DB, ST = SqlType> = BoxedSelectStatement<'a, ST, table, DB>;
605605

606606
__diesel_table_query_source_impl!(table, $schema_name, $table_name);
@@ -897,7 +897,7 @@ macro_rules! enable_multi_table_joins {
897897
///
898898
/// # Example
899899
///
900-
/// ### Returning SQL from a count statment:
900+
/// ### Returning SQL from a count statement:
901901
///
902902
/// ```rust
903903
/// # #[macro_use] extern crate diesel;
@@ -934,7 +934,7 @@ macro_rules! debug_sql {
934934
///
935935
/// # Example
936936
///
937-
/// ### Printing SQL from a count statment:
937+
/// ### Printing SQL from a count statement:
938938
///
939939
/// ```rust
940940
/// # #[macro_use] extern crate diesel;

diesel/src/pg/expression/extensions/interval_dsl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ pub trait MicroIntervalDsl: Sized + Mul<Self, Output=Self> {
135135
pub trait DayAndMonthIntervalDsl: Sized + Mul<Self, Output=Self> {
136136
/// Returns a PgInterval representing `self` in days
137137
fn days(self) -> PgInterval;
138-
/// Returns a PgInterval representing `self` in monhts
138+
/// Returns a PgInterval representing `self` in months
139139
fn months(self) -> PgInterval;
140140
#[doc(hidden)]
141141
fn times(self, x: i32) -> Self;

diesel/src/pg/upsert/on_conflict_actions.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use query_builder::*;
44
use query_source::*;
55
use result::QueryResult;
66

7-
/// Used in conjuction with
7+
/// Used in conjunction with
88
/// [`on_conflict`](trait.OnConflictExtension.html#method.on_conflict) to write
99
/// a query in the form `ON CONFLICT (name) DO NOTHING`. If you want to do
1010
/// nothing when *any* constraint conflicts, use

diesel/src/query_builder/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ impl<T: Query> AsQuery for T {
148148
///
149149
/// # Example
150150
///
151-
/// ### Returning SQL from a count statment:
151+
/// ### Returning SQL from a count statement:
152152
///
153153
/// ```rust
154154
/// # include!("src/doctest_setup.rs");

diesel/src/result.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use std::ffi::NulError;
66
#[derive(Debug)]
77
#[cfg_attr(feature = "clippy", allow(enum_variant_names))]
88
/// The generic "things can fail in a myriad of ways" enum. This type is not
9-
/// indended to be exhaustively matched, and new variants may be added in the
9+
/// intended to be exhaustively matched, and new variants may be added in the
1010
/// future without a major version bump.
1111
pub enum Error {
1212
InvalidCString(NulError),

diesel/src/types/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,13 +145,13 @@ use std::io::{self, Write};
145145
///
146146
/// ### [`ToSql`](/diesel/types/trait.ToSql.html) impls
147147
///
148-
/// - [`bigdecimal::BigDecimal`][bigdecimal] (currenty PostgreSQL and MySQL only, requires the `numeric`
148+
/// - [`bigdecimal::BigDecimal`][bigdecimal] (currently PostgreSQL and MySQL only, requires the `numeric`
149149
/// feature, which depends on the
150150
/// [`bigdecimal`][bigdecimal] crate)
151151
///
152152
/// ### [`FromSql`](/diesel/types/trait.FromSql.html) impls
153153
///
154-
/// - [`bigdecimal::BigDecimal`][BigDecimal] (currenty PostgreSQL and MySQL only, requires the `numeric`
154+
/// - [`bigdecimal::BigDecimal`][BigDecimal] (currently PostgreSQL and MySQL only, requires the `numeric`
155155
/// feature, which depends on the
156156
/// [`bigdecimal`][bigdecimal] crate)
157157
///

diesel_cli/src/database.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ pub fn drop_database_command(args: &ArgMatches) -> DatabaseResult<()> {
125125
}
126126

127127
/// Creates the database specified in the connection url. It returns an error
128-
/// it it was unable to create the database.
128+
/// it was unable to create the database.
129129
fn create_database_if_needed(database_url: &str) -> DatabaseResult<()> {
130130
match Backend::for_url(database_url) {
131131
#[cfg(feature="postgres")]

0 commit comments

Comments
 (0)