Skip to content

Commit

Permalink
rustfmt again (oops)
Browse files Browse the repository at this point in the history
  • Loading branch information
hawkw committed Dec 2, 2024
1 parent cab73b6 commit c86d368
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 6 deletions.
4 changes: 2 additions & 2 deletions dropshot/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,14 @@
//! errors into `HttpError`s, or implement the [`HttpResponseError`] trait to
//! provide their own mechanism.
use crate::ClientErrorStatusCode;
use crate::ErrorStatusCode;
use hyper::Error as HyperError;
use schemars::JsonSchema;
use serde::Deserialize;
use serde::Serialize;
use std::error::Error;
use std::fmt;
use crate::ErrorStatusCode;
use crate::ClientErrorStatusCode;

/// `HttpError` represents an error generated as part of handling an API
/// request. When these bubble up to the top of the request handling stack
Expand Down
2 changes: 0 additions & 2 deletions dropshot/src/error_status_code.rs
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,6 @@ macro_rules! impl_status_code_wrapper {
}

impl ErrorStatusCode {

// These constants are copied from the `http` crate's `StatusCode` type.
// Should new status codes be standardized and added upstream, we should add
// them to this list.
Expand Down Expand Up @@ -436,7 +435,6 @@ impl_status_code_wrapper! {
pub struct ClientErrorStatusCode(http::StatusCode);

impl ClientErrorStatusCode {

// These constants are copied from the `http` crate's `StatusCode` type.
// Should new status codes be standardized and added upstream, we should add
// them to this list.
Expand Down
2 changes: 1 addition & 1 deletion dropshot/src/handler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
//! facilities don't seem that valuable right now since they largely don't affect
//! OpenAPI document generation.
use super::error_status_code::ErrorStatusCode;
use super::error::HttpError;
use super::error_status_code::ErrorStatusCode;
use super::extractor::RequestExtractor;
use super::http_util::CONTENT_TYPE_JSON;
use super::http_util::CONTENT_TYPE_OCTET_STREAM;
Expand Down
2 changes: 1 addition & 1 deletion dropshot/src/router.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Copyright 2024 Oxide Computer Company
//! Routes incoming HTTP requests to handler functions
use super::error_status_code::ClientErrorStatusCode;
use super::error::HttpError;
use super::error_status_code::ClientErrorStatusCode;
use super::handler::RouteHandler;

use crate::api_description::ApiEndpointVersions;
Expand Down

0 comments on commit c86d368

Please sign in to comment.