rebase fixes

Author: seqre

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "cot_core"
-version = "0.4.0"
+version = "0.5.0"
 description = "The Rust web framework for lazy developers - framework core."
 categories = ["web-programming", "web-programming::http-server", "network-programming"]
 edition.workspace = true

cot-core/Cargo.toml

@@ -6,8 +6,7 @@ use crate::error::impl_into_cot_error;
 use crate::headers::JSON_CONTENT_TYPE;
 use crate::headers::{HTML_CONTENT_TYPE, OCTET_STREAM_CONTENT_TYPE, PLAIN_TEXT_CONTENT_TYPE};
 use crate::html::Html;
-use crate::response::Redirect;
-use crate::response::Response;
+use crate::response::{RESPONSE_BUILD_FAILURE, Redirect, Response};
 use crate::{Body, Error, StatusCode};
 
 /// Trait for generating responses.
@@ -387,7 +386,7 @@ impl IntoResponse for Body {
 }
 
 impl IntoResponse for Redirect {
-    fn into_response(self) -> cot::Result<Response> {
+    fn into_response(self) -> crate::Result<Response> {
         let response = http::Response::builder()
             .status(StatusCode::SEE_OTHER)
             .header(http::header::LOCATION, self.0)

cot-core/src/response/into_response.rs

@@ -39,7 +39,7 @@ use transport::{BoxedTransport, Transport};
 
 use crate::email::transport::TransportError;
 use crate::email::transport::console::Console;
-use crate::error::error_impl::impl_into_cot_error;
+use crate::error::impl_into_cot_error;
 const ERROR_PREFIX: &str = "email message build error:";
 
 /// Represents errors that can occur when sending an email.

cot/src/email.rs

@@ -11,7 +11,7 @@ use cot::email::EmailMessageError;
 use thiserror::Error;
 
 use crate::email::EmailMessage;
-use crate::error::error_impl::impl_into_cot_error;
+use crate::error::impl_into_cot_error;
 
 pub mod console;
 pub mod smtp;

cot/src/email/transport.rs

@@ -21,9 +21,9 @@ pub(crate) use cot_core::request::{AppName, InvalidContentType, RouteName};
 pub use cot_core::request::{PathParams, PathParamsDeserializerError, Request, RequestHead};
 use http::Extensions;
 
+use crate::Result;
 use crate::request::extractors::FromRequestHead;
 use crate::router::Router;
-use crate::{Body, Result};
 
 pub mod extractors;
 mod private {