Skip to content

Remove explicit use of PgConnection as this is now in the prelude #1022

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

Merged
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
1 change: 0 additions & 1 deletion build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ extern crate diesel;
extern crate dotenv;

use diesel::migrations::run_pending_migrations;
use diesel::pg::PgConnection;
use diesel::prelude::*;
use dotenv::dotenv;
use std::env;
Expand Down
2 changes: 1 addition & 1 deletion src/badge.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use krate::Crate;
use schema::badges;

use diesel::pg::{Pg, PgConnection};
use diesel::pg::Pg;
use diesel::prelude::*;
use serde_json;
use std::collections::HashMap;
Expand Down
1 change: 0 additions & 1 deletion src/bin/delete-crate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ extern crate diesel;
extern crate time;

use diesel::prelude::*;
use diesel::pg::PgConnection;
use std::env;
use std::io;
use std::io::prelude::*;
Expand Down
1 change: 0 additions & 1 deletion src/bin/delete-version.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ extern crate time;
extern crate semver;

use diesel::prelude::*;
use diesel::pg::PgConnection;
use std::env;
use std::io;
use std::io::prelude::*;
Expand Down
1 change: 0 additions & 1 deletion src/bin/populate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ extern crate diesel_codegen;
extern crate rand;

use chrono::{Utc, NaiveDate, Duration};
use diesel::pg::PgConnection;
use diesel::prelude::*;
use rand::{StdRng, Rng};
use std::env;
Expand Down
1 change: 0 additions & 1 deletion src/bin/transfer-crates.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ extern crate diesel;
extern crate semver;

use diesel::prelude::*;
use diesel::pg::PgConnection;
use std::env;
use std::io;
use std::io::prelude::*;
Expand Down
1 change: 0 additions & 1 deletion src/bin/update-downloads.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ extern crate time;

use chrono::NaiveDate;
use diesel::prelude::*;
use diesel::pg::PgConnection;
use diesel::pg::upsert::*;
use std::env;
use std::time::Duration;
Expand Down
1 change: 0 additions & 1 deletion src/categories.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

use diesel;
use diesel::prelude::*;
use diesel::pg::PgConnection;
use toml;

use db;
Expand Down
1 change: 0 additions & 1 deletion src/category.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ use time::Timespec;
use conduit::{Request, Response};
use conduit_router::RequestParams;
use diesel::*;
use diesel::pg::PgConnection;

use Crate;
use db::RequestTransaction;
Expand Down
3 changes: 1 addition & 2 deletions src/db.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
use std::env;

use conduit::Request;
use diesel::pg::PgConnection;
use diesel::prelude::ConnectionResult;
use diesel::prelude::{PgConnection, ConnectionResult};
use r2d2;
use r2d2_diesel::{self, ConnectionManager};
use url::Url;
Expand Down
2 changes: 1 addition & 1 deletion src/dependency.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use diesel::prelude::*;
use diesel::pg::{Pg, PgConnection};
use diesel::pg::Pg;
use diesel::types::{Integer, Text};
use semver;

Expand Down
1 change: 0 additions & 1 deletion src/download.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
use chrono::NaiveDate;
use diesel;
use diesel::prelude::*;
use diesel::pg::PgConnection;

use schema::version_downloads;
use version::Version;
Expand Down
1 change: 0 additions & 1 deletion src/keyword.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ use time::Timespec;

use conduit::{Request, Response};
use conduit_router::RequestParams;
use diesel::pg::PgConnection;
use diesel::prelude::*;
use diesel;

Expand Down
2 changes: 1 addition & 1 deletion src/krate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use conduit_router::RequestParams;
use diesel::associations::Identifiable;
use diesel::helper_types::Select;
use diesel::pg::upsert::*;
use diesel::pg::{Pg, PgConnection};
use diesel::pg::Pg;
use diesel::prelude::*;
use diesel;
use diesel_full_text_search::*;
Expand Down
1 change: 0 additions & 1 deletion src/owner.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use diesel::prelude::*;
use diesel::pg::PgConnection;

use app::App;
use http;
Expand Down
1 change: 0 additions & 1 deletion src/tests/all.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ use cargo_registry::user::AuthenticationSource;
use cargo_registry::{User, Crate, Version, Dependency, Replica};
use conduit::{Request, Method};
use conduit_test::MockRequest;
use diesel::pg::PgConnection;
use diesel::prelude::*;
use diesel::pg::upsert::*;
use cargo_registry::schema::*;
Expand Down
1 change: 0 additions & 1 deletion src/tests/categories.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use cargo_registry::schema::categories;
use diesel::*;
use diesel::pg::PgConnection;
use dotenv::dotenv;

use std::env;
Expand Down
1 change: 0 additions & 1 deletion src/token.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use diesel;
use diesel::prelude::*;
use diesel::pg::PgConnection;
use conduit::{Request, Response};
use time::Timespec;
use conduit_router::RequestParams;
Expand Down
1 change: 0 additions & 1 deletion src/user/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ use conduit::{Request, Response};
use conduit_cookie::RequestSession;
use conduit_router::RequestParams;
use diesel::prelude::*;
use diesel::pg::PgConnection;
use rand::{thread_rng, Rng};
use std::borrow::Cow;
use serde_json;
Expand Down
2 changes: 1 addition & 1 deletion src/version.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::collections::HashMap;
use conduit::{Request, Response};
use conduit_router::RequestParams;
use diesel;
use diesel::pg::{Pg, PgConnection};
use diesel::pg::Pg;
use diesel::pg::upsert::*;
use diesel::prelude::*;
use semver;
Expand Down