Skip to content

Commit c4f7bca

Browse files
committed
fix formatting
Signed-off-by: Matt Wrock <matt@mattwrock.com>
1 parent ccc3a33 commit c4f7bca

3 files changed

Lines changed: 10 additions & 17 deletions

File tree

components/builder-api/src/server/framework/middleware.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -197,13 +197,13 @@ fn finalize_session_with_account(_token: &str,
197197
state: &AppState)
198198
-> error::Result<originsrv::Session> {
199199
let account = Account::get_by_id(session.id() as i64, conn).map_err(|e| {
200-
trace!("Failed to find \
201-
account for id \
202-
{}: {:?}",
203-
session.id(),
204-
e);
205-
error::Error::Authorization
206-
})?;
200+
trace!("Failed to find \
201+
account for id {}: \
202+
{:?}",
203+
session.id(),
204+
e);
205+
error::Error::Authorization
206+
})?;
207207

208208
trace!("Found account for token {} in database", new_token);
209209
session.set_name(account.name);

components/builder-api/src/server/resources/origins.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1293,9 +1293,7 @@ async fn depart_from_origin(req: HttpRequest,
12931293
Err(err) => return err.into(),
12941294
};
12951295

1296-
debug!("Departing user {} from origin {}",
1297-
session.name(),
1298-
&origin);
1296+
debug!("Departing user {} from origin {}", session.name(), &origin);
12991297

13001298
match Origin::depart(&origin, session.id() as i64, &mut conn).map_err(Error::DieselError) {
13011299
Ok(_) => HttpResponse::NoContent().finish(),

components/builder-protocol/src/originsrv.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,7 @@ impl fmt::Display for OriginPackageIdent {
5252
self.version(),
5353
self.release())
5454
} else if !self.version().is_empty() {
55-
write!(f,
56-
"{}/{}/{}",
57-
self.origin(),
58-
self.name(),
59-
self.version())
55+
write!(f, "{}/{}/{}", self.origin(), self.name(), self.version())
6056
} else {
6157
write!(f, "{}/{}", self.origin(), self.name())
6258
}
@@ -84,8 +80,7 @@ impl From<hab_core::package::PackageIdent> for OriginPackageIdent {
8480

8581
impl From<OriginPackageIdent> for package::PackageIdent {
8682
fn from(value: OriginPackageIdent) -> package::PackageIdent {
87-
let mut ident =
88-
package::PackageIdent::new(value.origin(), value.name(), None, None);
83+
let mut ident = package::PackageIdent::new(value.origin(), value.name(), None, None);
8984
if !value.version().is_empty() {
9085
ident.version = Some(value.version().into());
9186
}

0 commit comments

Comments
 (0)