Skip to content

Fix doctests for nightly #1101

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.

Sign up for GitHub

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

Merged
Eijebong merged 1 commit into from
Sep 2, 2017
Merged

Fix doctests for nightly #1101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,8 @@ script:
matrix:
allow_failures:
- rust: nightly
- rust: beta
include:
- rust: nightly-2017-06-06
- rust: nightly-2017-08-31
env: CLIPPY_AND_COMPILE_TESTS=YESPLEASE
script:
- (cd diesel && cargo rustc --no-default-features --features "lint unstable sqlite postgres mysql extras" -- -Zno-trans)
Expand Down
2 changes: 1 addition & 1 deletion diesel/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ categories = ["database"]
[dependencies]
byteorder = "1.0"
chrono = { version = "0.4", optional = true }
clippy = { optional = true, version = "=0.0.138" }
clippy = { optional = true, version = "=0.0.155" }
libc = { version = "0.2.0", optional = true }
libsqlite3-sys = { version = ">=0.8.0, <0.9.0", optional = true, features = ["min_sqlite_version_3_7_16"] }
mysqlclient-sys = { version = ">=0.1.0, <0.3.0", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion diesel/src/associations/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
//! // derive Identifiable.
//! # #[macro_use] extern crate diesel;
//! # #[macro_use] extern crate diesel_codegen;
//! # include!("src/doctest_setup.rs");
//! # include!("../doctest_setup.rs");
//! use schema::{posts, users};
//!
//! #[derive(Identifiable, Queryable)]
Expand Down
2 changes: 1 addition & 1 deletion diesel/src/connection/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ pub trait Connection: SimpleConnection + Sized + Send {
/// ```rust
/// # #[macro_use] extern crate diesel;
/// # #[macro_use] extern crate diesel_codegen;
/// # include!("src/doctest_setup.rs");
/// # include!("../doctest_setup.rs");
/// # table!(
/// # users(id) {
/// # id -> Integer,
Expand Down
4 changes: 2 additions & 2 deletions diesel/src/expression/count.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use types::BigInt;
///
/// ```rust
/// # #[macro_use] extern crate diesel;
/// # include!("src/doctest_setup.rs");
/// # include!("../doctest_setup.rs");
/// # use diesel::expression::dsl::*;
/// #
/// # table! {
Expand Down Expand Up @@ -50,7 +50,7 @@ pub fn count<T: Expression>(t: T) -> Count<T> {
///
/// ```rust
/// # #[macro_use] extern crate diesel;
/// # include!("src/doctest_setup.rs");
/// # include!("../doctest_setup.rs");
/// # use diesel::expression::dsl::*;
/// #
/// # table! {
Expand Down
2 changes: 1 addition & 1 deletion diesel/src/expression/exists.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use types::Bool;
///
/// ```rust
/// # #[macro_use] extern crate diesel;
/// # include!("src/doctest_setup.rs");
/// # include!("../doctest_setup.rs");
/// #
/// # table! {
/// # users {
Expand Down
4 changes: 2 additions & 2 deletions diesel/src/expression/functions/aggregate_folding.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Foldable.

```rust
# #[macro_use] extern crate diesel;
# include!(\"src/doctest_setup.rs\");
# include!(\"../../doctest_setup.rs\");
# use diesel::expression::dsl::*;
#
# table! {
Expand All @@ -78,7 +78,7 @@ Foldable.

```rust
# #[macro_use] extern crate diesel;
# include!(\"src/doctest_setup.rs\");
# include!(\"../../doctest_setup.rs\");
# use diesel::expression::dsl::*;
#
# table! {
Expand Down
4 changes: 2 additions & 2 deletions diesel/src/expression/functions/aggregate_ordering.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ ordered.

```rust
# #[macro_use] extern crate diesel;
# include!(\"src/doctest_setup.rs\");
# include!(\"../../doctest_setup.rs\");
# use diesel::expression::dsl::*;
#
# table! {
Expand All @@ -77,7 +77,7 @@ ordered.

```rust
# #[macro_use] extern crate diesel;
# include!(\"src/doctest_setup.rs\");
# include!(\"../../doctest_setup.rs\");
# use diesel::expression::dsl::*;
#
# table! {
Expand Down
2 changes: 1 addition & 1 deletion diesel/src/expression/functions/date_and_time.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ expression, and the return value will be an expression of type Date.
```ignore
# #[macro_use] extern crate diesel;
# extern crate chrono;
# include!(\"src/doctest_setup.rs\");
# include!(\"../../doctest_setup.rs\");
# use diesel::expression::dsl::*;
#
# table! {
Expand Down
2 changes: 1 addition & 1 deletion diesel/src/expression/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ use query_builder::{QueryFragment, QueryId};
/// # #[macro_use] extern crate diesel_codegen;
/// # #[macro_use] extern crate diesel;
/// # use diesel::types;
/// # include!("src/doctest_setup.rs");
/// # include!("../doctest_setup.rs");
/// #
/// # table! {
/// # users {
Expand Down
2 changes: 1 addition & 1 deletion diesel/src/expression/not.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use types::Bool;
///
/// ```rust
/// # #[macro_use] extern crate diesel;
/// # include!("src/doctest_setup.rs");
/// # include!("../doctest_setup.rs");
/// #
/// # table! {
/// # users {
Expand Down
2 changes: 1 addition & 1 deletion diesel/src/expression/operators.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ macro_rules! __diesel_operator_to_sql {
///
/// ```rust
/// # #[macro_use] extern crate diesel;
/// # include!("src/doctest_setup.rs");
/// # include!("../doctest_setup.rs");
/// #
/// # table! {
/// # users {
Expand Down
6 changes: 3 additions & 3 deletions diesel/src/expression/sql_literal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ impl<ST> SqlLiteral<ST> {
///
/// ```rust
/// # #[macro_use] extern crate diesel;
/// # include!("src/doctest_setup.rs");
/// # include!("../doctest_setup.rs");
/// #
/// # table! {
/// # users {
Expand Down Expand Up @@ -72,7 +72,7 @@ impl<ST> SqlLiteral<ST> {
///
/// ```rust
/// # #[macro_use] extern crate diesel;
/// # include!("src/doctest_setup.rs");
/// # include!("../doctest_setup.rs");
/// #
/// # table! {
/// # users {
Expand Down Expand Up @@ -158,7 +158,7 @@ impl<ST> NonAggregate for SqlLiteral<ST> {
/// # #[macro_use] extern crate diesel_codegen;
/// use diesel::expression::sql;
/// use diesel::types::{Bool, Integer, Text};
/// # include!("src/doctest_setup.rs");
/// # include!("../doctest_setup.rs");
/// # table! {
/// # users {
/// # id -> Integer,
Expand Down
2 changes: 1 addition & 1 deletion diesel/src/expression_methods/escape_expression_methods.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use types::VarChar;
///
/// ```rust
/// # #[macro_use] extern crate diesel;
/// # include!("src/doctest_setup.rs");
/// # include!("../doctest_setup.rs");
/// #
/// # table! {
/// # users {
Expand Down
20 changes: 10 additions & 10 deletions diesel/src/expression_methods/global_expression_methods.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pub trait ExpressionMethods: Expression + Sized {
///
/// ```rust
/// # #[macro_use] extern crate diesel;
/// # include!("src/doctest_setup.rs");
/// # include!("../doctest_setup.rs");
/// #
/// # table! {
/// # users {
Expand All @@ -36,7 +36,7 @@ pub trait ExpressionMethods: Expression + Sized {
///
/// ```rust
/// # #[macro_use] extern crate diesel;
/// # include!("src/doctest_setup.rs");
/// # include!("../doctest_setup.rs");
/// #
/// # table! {
/// # users {
Expand Down Expand Up @@ -65,7 +65,7 @@ pub trait ExpressionMethods: Expression + Sized {
///
/// ```rust
/// # #[macro_use] extern crate diesel;
/// # include!("src/doctest_setup.rs");
/// # include!("../doctest_setup.rs");
/// #
/// # table! {
/// # users {
Expand Down Expand Up @@ -102,7 +102,7 @@ pub trait ExpressionMethods: Expression + Sized {
///
/// ```rust
/// # #[macro_use] extern crate diesel;
/// # include!("src/doctest_setup.rs");
/// # include!("../doctest_setup.rs");
/// #
/// # table! {
/// # users {
Expand Down Expand Up @@ -149,7 +149,7 @@ pub trait ExpressionMethods: Expression + Sized {
///
/// ```rust
/// # #[macro_use] extern crate diesel;
/// # include!("src/doctest_setup.rs");
/// # include!("../doctest_setup.rs");
/// #
/// # table! {
/// # users {
Expand All @@ -175,7 +175,7 @@ pub trait ExpressionMethods: Expression + Sized {
///
/// ```rust
/// # #[macro_use] extern crate diesel;
/// # include!("src/doctest_setup.rs");
/// # include!("../doctest_setup.rs");
/// #
/// # table! {
/// # users {
Expand All @@ -201,7 +201,7 @@ pub trait ExpressionMethods: Expression + Sized {
///
/// ```rust
/// # #[macro_use] extern crate diesel;
/// # include!("src/doctest_setup.rs");
/// # include!("../doctest_setup.rs");
/// #
/// # table! {
/// # users {
Expand All @@ -227,7 +227,7 @@ pub trait ExpressionMethods: Expression + Sized {
///
/// ```rust
/// # #[macro_use] extern crate diesel;
/// # include!("src/doctest_setup.rs");
/// # include!("../doctest_setup.rs");
/// #
/// # table! {
/// # users {
Expand Down Expand Up @@ -275,7 +275,7 @@ pub trait ExpressionMethods: Expression + Sized {
///
/// ```rust
/// # #[macro_use] extern crate diesel;
/// # include!("src/doctest_setup.rs");
/// # include!("../doctest_setup.rs");
/// #
/// # table! {
/// # users {
Expand Down Expand Up @@ -316,7 +316,7 @@ pub trait NullableExpressionMethods: Expression + Sized {
/// ```no_run
/// # #![allow(dead_code)]
/// # #[macro_use] extern crate diesel;
/// # include!("src/doctest_setup.rs");
/// # include!("../doctest_setup.rs");
/// # use self::diesel::types::*;
/// #
/// table! {
Expand Down
2 changes: 1 addition & 1 deletion diesel/src/expression_methods/text_expression_methods.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pub trait TextExpressionMethods: Expression<SqlType=Text> + Sized {
///
/// ```rust
/// # #[macro_use] extern crate diesel;
/// # include!("src/doctest_setup.rs");
/// # include!("../doctest_setup.rs");
/// #
/// # table! {
/// # users {
Expand Down
2 changes: 1 addition & 1 deletion diesel/src/macros/as_changeset.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
/// # #[macro_use] extern crate diesel_codegen;
/// # #[macro_use] extern crate diesel;
/// # table! { users { id -> Integer, name -> VarChar, } }
/// # include!("src/doctest_setup.rs");
/// # include!("../doctest_setup.rs");
///
/// #[derive(PartialEq, Debug, Queryable)]
/// struct User {
Expand Down
2 changes: 1 addition & 1 deletion diesel/src/macros/macros_from_codegen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ macro_rules! infer_table_from_schema {
/// ```rust
/// # #[macro_use] extern crate diesel;
/// # #[macro_use] extern crate diesel_codegen;
/// # include!("src/doctest_setup.rs");
/// # include!("../doctest_setup.rs");
/// # table! {
/// # users {
/// # id -> Integer,
Expand Down
2 changes: 1 addition & 1 deletion diesel/src/mysql/connection/raw.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ impl RawConnection {
user.as_ptr(),
password.map(CStr::as_ptr).unwrap_or_else(|| ptr::null_mut()),
database.map(CStr::as_ptr).unwrap_or_else(|| ptr::null_mut()),
port.unwrap_or(0) as u32,
u32::from(port.unwrap_or(0)),
ptr::null_mut(),
0,
)
Expand Down
2 changes: 1 addition & 1 deletion diesel/src/mysql/types/date_and_time.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ impl ToSql<Timestamp, Mysql> for NaiveDateTime {
mysql_time.hour = self.hour() as libc::c_uint;
mysql_time.minute = self.minute() as libc::c_uint;
mysql_time.second = self.second() as libc::c_uint;
mysql_time.second_part = self.timestamp_subsec_micros() as libc::c_ulong;
mysql_time.second_part = libc::c_ulong::from(self.timestamp_subsec_micros());

<ffi::MYSQL_TIME as ToSql<Timestamp, Mysql>>::to_sql(&mysql_time, out)
}
Expand Down
4 changes: 2 additions & 2 deletions diesel/src/pg/expression/array_comparison.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use types::Array;
///
/// ```rust
/// # #[macro_use] extern crate diesel;
/// # include!("src/doctest_setup.rs");
/// # include!("../../doctest_setup.rs");
/// # use diesel::expression::dsl::*;
/// #
/// # table! {
Expand Down Expand Up @@ -50,7 +50,7 @@ pub fn any<ST, T>(vals: T) -> Any<T::Expression> where
///
/// ```rust
/// # #[macro_use] extern crate diesel;
/// # include!("src/doctest_setup.rs");
/// # include!("../../doctest_setup.rs");
/// # use diesel::expression::dsl::*;
/// #
/// # table! {
Expand Down
14 changes: 7 additions & 7 deletions diesel/src/pg/expression/expression_methods.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pub trait PgExpressionMethods: Expression + Sized {
///
/// ```rust
/// # #[macro_use] extern crate diesel;
/// # include!("src/doctest_setup.rs");
/// # include!("../../doctest_setup.rs");
/// #
/// # table! {
/// # users {
Expand Down Expand Up @@ -44,7 +44,7 @@ pub trait PgExpressionMethods: Expression + Sized {
///
/// ```rust
/// # #[macro_use] extern crate diesel;
/// # include!("src/doctest_setup.rs");
/// # include!("../../doctest_setup.rs");
/// #
/// # table! {
/// # users {
Expand Down Expand Up @@ -98,7 +98,7 @@ pub trait ArrayExpressionMethods<ST>: Expression<SqlType=Array<ST>> + Sized {
/// ```rust
/// # #[macro_use] extern crate diesel;
/// # #[macro_use] extern crate diesel_codegen;
/// # include!("src/doctest_setup.rs");
/// # include!("../../doctest_setup.rs");
/// #
/// # table! {
/// # posts {
Expand Down Expand Up @@ -154,7 +154,7 @@ pub trait ArrayExpressionMethods<ST>: Expression<SqlType=Array<ST>> + Sized {
/// ```rust
/// # #[macro_use] extern crate diesel;
/// # #[macro_use] extern crate diesel_codegen;
/// # include!("src/doctest_setup.rs");
/// # include!("../../doctest_setup.rs");
/// #
/// # table! {
/// # posts {
Expand Down Expand Up @@ -206,7 +206,7 @@ pub trait ArrayExpressionMethods<ST>: Expression<SqlType=Array<ST>> + Sized {
/// ```rust
/// # #[macro_use] extern crate diesel;
/// # #[macro_use] extern crate diesel_codegen;
/// # include!("src/doctest_setup.rs");
/// # include!("../../doctest_setup.rs");
/// #
/// # table! {
/// # posts {
Expand Down Expand Up @@ -268,7 +268,7 @@ pub trait SortExpressionMethods : Sized {
/// ```rust
/// # #[macro_use] extern crate diesel;
/// # #[macro_use] extern crate diesel_codegen;
/// # include!("src/doctest_setup.rs");
/// # include!("../../doctest_setup.rs");
/// #
/// # table! {
/// # users {
Expand Down Expand Up @@ -311,7 +311,7 @@ pub trait SortExpressionMethods : Sized {
/// ```rust
/// # #[macro_use] extern crate diesel;
/// # #[macro_use] extern crate diesel_codegen;
/// # include!("src/doctest_setup.rs");
/// # include!("../../doctest_setup.rs");
/// #
/// # table! {
/// # users {
Expand Down
Loading