Skip to content

Fix ambiguous imports #669

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ivmarkov merged 1 commit into from
Jul 15, 2026
Merged

Fix ambiguous imports #669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions src/http/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ use alloc::string::ToString;

use ::log::*;

#[allow(unused_imports)]
use embedded_svc::http::client::*;
use embedded_svc::io::{ErrorType, Read, Write};

use crate::sys::*;
Expand Down Expand Up @@ -551,7 +549,7 @@ impl RawHandle for EspHttpConnection {
}
}

impl Status for EspHttpConnection {
impl embedded_svc::http::Status for EspHttpConnection {
fn status(&self) -> u16 {
EspHttpConnection::status(self)
}
Expand Down Expand Up @@ -593,7 +591,7 @@ impl Write for EspHttpConnection {
}
}

impl Connection for EspHttpConnection {
impl embedded_svc::http::client::Connection for EspHttpConnection {
type Headers = Self;

type Read = Self;
Expand Down
6 changes: 2 additions & 4 deletions src/http/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ use alloc::vec::Vec;
use ::log::{info, warn};

use embedded_svc::http::headers::content_type;
#[allow(unused_imports)]
use embedded_svc::http::*;
use embedded_svc::io::{ErrorType, Read, Write};

use esp_idf_hal::cpu::Core;
Expand Down Expand Up @@ -661,7 +659,7 @@ impl<'a> EspHttpServer<'a> {

fn to_native_handler<H>(&self, handler: H) -> NativeHandler<'a>
where
H: for<'r> Handler<EspHttpConnection<'a>> + Send + 'a,
H: Handler<EspHttpConnection<'a>> + Send + 'a,
{
Box::new(move |raw_req| {
let mut connection = EspHttpConnection::new(unsafe { raw_req.as_mut().unwrap() });
Expand Down Expand Up @@ -1231,7 +1229,7 @@ impl RawHandle for EspHttpConnection<'_> {
}
}

impl Query for EspHttpConnection<'_> {
impl embedded_svc::http::Query for EspHttpConnection<'_> {
fn uri(&self) -> &str {
EspHttpConnection::uri(self)
}
Expand Down
Loading