Skip to content

Commit cd6c3fe

Browse files
committed
Import either cargo_prelude or frontend_prelude in controlers
This serves as a guard rail to help avoid using the wrong error response method. Two files still reference the generic prelude, becuase those files contain mixed endpoints and there is no reason to do a larger refactor at this time.
1 parent bb072c2 commit cd6c3fe

File tree

10 files changed

+10
-10
lines changed

10 files changed

+10
-10
lines changed

src/controllers/krate/downloads.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
use std::cmp;
77

8-
use crate::controllers::prelude::*;
8+
use crate::controllers::frontend_prelude::*;
99

1010
use crate::models::{Crate, CrateVersions, Version, VersionDownload};
1111
use crate::schema::version_downloads;

src/controllers/krate/follow.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
use diesel::associations::Identifiable;
44

5-
use crate::controllers::prelude::*;
5+
use crate::controllers::frontend_prelude::*;
66
use crate::db::DieselPooledConn;
77
use crate::models::{Crate, Follow};
88
use crate::schema::*;

src/controllers/krate/metadata.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//! index or cached metadata which was extracted (client side) from the
55
//! `Cargo.toml` file.
66
7-
use crate::controllers::prelude::*;
7+
use crate::controllers::frontend_prelude::*;
88
use crate::models::user;
99
use crate::models::user::UserNoEmailType;
1010
use crate::models::{

src/controllers/krate/publish.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use hex::ToHex;
44
use std::sync::Arc;
55
use swirl::Job;
66

7-
use crate::controllers::prelude::*;
7+
use crate::controllers::cargo_prelude::*;
88
use crate::git;
99
use crate::models::dependency;
1010
use crate::models::{Badge, Category, Keyword, NewCrate, NewVersion, Rights, User};

src/controllers/krate/search.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
use diesel::dsl::*;
44
use diesel_full_text_search::*;
55

6+
use crate::controllers::cargo_prelude::*;
67
use crate::controllers::helpers::Paginate;
7-
use crate::controllers::prelude::*;
88
use crate::models::{Crate, CrateBadge, CrateOwner, CrateVersions, OwnerKind, Version};
99
use crate::schema::*;
1010
use crate::views::EncodableCrate;

src/controllers/team.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::controllers::prelude::*;
1+
use crate::controllers::frontend_prelude::*;
22

33
use crate::models::Team;
44
use crate::schema::teams;

src/controllers/user/other.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::controllers::prelude::*;
1+
use crate::controllers::frontend_prelude::*;
22

33
use crate::models::user;
44
use crate::models::user::UserNoEmailType;

src/controllers/version/deprecated.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
//! period of time to ensure there are no external users of an endpoint before
66
//! it is removed.
77
8-
use crate::controllers::prelude::*;
8+
use crate::controllers::frontend_prelude::*;
99

1010
use crate::models::user;
1111
use crate::models::user::UserNoEmailType;

src/controllers/version/metadata.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//! index or cached metadata which was extracted (client side) from the
55
//! `Cargo.toml` file.
66
7-
use crate::controllers::prelude::*;
7+
use crate::controllers::frontend_prelude::*;
88

99
use crate::schema::*;
1010
use crate::views::{EncodableDependency, EncodablePublicUser, EncodableVersion};

src/controllers/version/yank.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use swirl::Job;
44

55
use super::version_and_crate;
6-
use crate::controllers::prelude::*;
6+
use crate::controllers::cargo_prelude::*;
77
use crate::git;
88
use crate::models::Rights;
99
use crate::util::AppError;

0 commit comments

Comments
 (0)