Skip to content

Commit

Permalink
Merge branch 'master' into bump-env_logger
Browse files Browse the repository at this point in the history
  • Loading branch information
seanmonstar committed Aug 13, 2024
2 parents 9bbd300 + a53c944 commit c1bfa0c
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/blocking/body.rs
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ async fn send_future(sender: Sender) -> Result<(), crate::Error> {
//
// We need to know whether there is any data to send before
// we check the transmission channel (with poll_ready below)
// because somestimes the receiver disappears as soon as is
// because sometimes the receiver disappears as soon as is
// considers the data is completely transmitted, which may
// be true.
//
Expand Down
2 changes: 1 addition & 1 deletion src/dns/hickory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ impl Iterator for SocketAddrs {

/// Create a new resolver with the default configuration,
/// which reads from `/etc/resolve.conf`. The options are
/// overriden to look up for both IPv4 and IPv6 addresses
/// overridden to look up for both IPv4 and IPv6 addresses
/// to work with "happy eyeballs" algorithm.
fn new_resolver() -> io::Result<TokioAsyncResolver> {
let (config, mut opts) = system_conf::read_system_conf().map_err(|e| {
Expand Down
4 changes: 4 additions & 0 deletions src/wasm/body.rs
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,10 @@ impl fmt::Debug for Body {
}
}

// Can use new methods in web-sys when requiring v0.2.93.
// > `init.method(m)` to `init.set_method(m)`
// For now, ignore their deprecation.
#[allow(deprecated)]
#[cfg(test)]
mod tests {
use crate::Body;
Expand Down
4 changes: 4 additions & 0 deletions src/wasm/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,10 @@ impl fmt::Debug for ClientBuilder {
}
}

// Can use new methods in web-sys when requiring v0.2.93.
// > `init.method(m)` to `init.set_method(m)`
// For now, ignore their deprecation.
#[allow(deprecated)]
async fn fetch(req: Request) -> crate::Result<Response> {
// Build the js Request
let mut init = web_sys::RequestInit::new();
Expand Down

0 comments on commit c1bfa0c

Please sign in to comment.