Skip to content

Prepare for new rustfmt in 1.27 release #1437

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 1 commit into from
Jun 21, 2018
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
5 changes: 3 additions & 2 deletions src/controllers/krate/metadata.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
use controllers::prelude::*;
use models::{Category, Crate, CrateCategory, CrateDownload, CrateKeyword, Keyword, Version};
use schema::*;
use views::{EncodableCategory, EncodableCrate, EncodableDependency, EncodableKeyword,
EncodableVersion};
use views::{
EncodableCategory, EncodableCrate, EncodableDependency, EncodableKeyword, EncodableVersion,
};

use models::krate::ALL_COLUMNS;

Expand Down
6 changes: 4 additions & 2 deletions src/models/krate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ use url::Url;
use app::App;
use util::{human, CargoResult};

use models::{Badge, Category, CrateOwner, Keyword, NewCrateOwnerInvitation, Owner, OwnerKind,
ReverseDependency, User, Version};
use models::{
Badge, Category, CrateOwner, Keyword, NewCrateOwnerInvitation, Owner, OwnerKind,
ReverseDependency, User, Version,
};
use views::{EncodableCrate, EncodableCrateLinks};

use models::helpers::with_count::*;
Expand Down
3 changes: 2 additions & 1 deletion src/render.rs
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,8 @@ impl<'a> MarkdownRenderer<'a> {

let use_relative = if let Some(base_url) = base_url {
if let Ok(url) = Url::parse(base_url) {
url.host_str() == Some("github.com") || url.host_str() == Some("gitlab.com")
url.host_str() == Some("github.com")
|| url.host_str() == Some("gitlab.com")
|| url.host_str() == Some("bitbucket.org")
} else {
false
Expand Down
15 changes: 10 additions & 5 deletions src/tests/krate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ use {CrateList, CrateMeta, GoodCrate};
use models::{ApiToken, Category, Crate};
use schema::{crates, metadata, versions};
use views::krate_publish as u;
use views::{EncodableCategory, EncodableCrate, EncodableDependency, EncodableKeyword,
EncodableVersion, EncodableVersionDownload};
use views::{
EncodableCategory, EncodableCrate, EncodableDependency, EncodableKeyword, EncodableVersion,
EncodableVersionDownload,
};

#[derive(Deserialize)]
struct VersionsList {
Expand Down Expand Up @@ -1972,7 +1974,8 @@ fn author_license_and_description_required() {
req.with_body(&::new_crate_to_body(&new_crate, &[]));
let json = bad_resp!(middle.call(&mut req));
assert!(
json.errors[0].detail.contains("author") && json.errors[0].detail.contains("description")
json.errors[0].detail.contains("author")
&& json.errors[0].detail.contains("description")
&& json.errors[0].detail.contains("license"),
"{:?}",
json.errors
Expand All @@ -1983,7 +1986,8 @@ fn author_license_and_description_required() {
req.with_body(&::new_crate_to_body(&new_crate, &[]));
let json = bad_resp!(middle.call(&mut req));
assert!(
json.errors[0].detail.contains("author") && json.errors[0].detail.contains("description")
json.errors[0].detail.contains("author")
&& json.errors[0].detail.contains("description")
&& !json.errors[0].detail.contains("license"),
"{:?}",
json.errors
Expand All @@ -1995,7 +1999,8 @@ fn author_license_and_description_required() {
req.with_body(&::new_crate_to_body(&new_crate, &[]));
let json = bad_resp!(middle.call(&mut req));
assert!(
!json.errors[0].detail.contains("author") && json.errors[0].detail.contains("description")
!json.errors[0].detail.contains("author")
&& json.errors[0].detail.contains("description")
&& !json.errors[0].detail.contains("license"),
"{:?}",
json.errors
Expand Down
4 changes: 3 additions & 1 deletion src/tests/owners.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ use diesel::prelude::*;

use models::{Crate, NewCrateOwnerInvitation};
use schema::crate_owner_invitations;
use views::{EncodableCrateOwnerInvitation, EncodableOwner, EncodablePublicUser, InvitationResponse};
use views::{
EncodableCrateOwnerInvitation, EncodableOwner, EncodablePublicUser, InvitationResponse,
};

#[derive(Deserialize)]
struct TeamResponse {
Expand Down
4 changes: 3 additions & 1 deletion src/util/io_util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ pub fn read_le_u32<R: Read + ?Sized>(r: &mut R) -> io::Result<u32> {
let mut b = [0; 4];
read_fill(r, &mut b)?;
Ok(
u32::from(b[0]) | (u32::from(b[1]) << 8) | (u32::from(b[2]) << 16)
u32::from(b[0])
| (u32::from(b[1]) << 8)
| (u32::from(b[2]) << 16)
| (u32::from(b[3]) << 24),
)
}
Expand Down