Merge branch 'master' into server-ffi

hyperium · Apr 17, 2023 · f5c283c · f5c283c
2 parents c73a994 + 5679767
commit f5c283c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,7 +39,6 @@ want = "0.3"
 # Optional
 
 libc = { version = "0.2", optional = true }
-socket2 = { version = "0.4", optional = true }
 
 [dev-dependencies]
 futures-util = { version = "0.3", default-features = false, features = ["alloc"] }

diff --git a/examples/gateway.rs b/examples/gateway.rs
@@ -60,7 +60,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                 .serve_connection(stream, service)
                 .await
             {
-                println!("Failed to servce connection: {:?}", err);
+                println!("Failed to serve the connection: {:?}", err);
             }
         });
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -60,7 +60,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> { @@
                     .serve_connection(stream, service)
                     .await
                 {
-                    println!("Failed to servce connection: {:?}", err);
+                    println!("Failed to serve the connection: {:?}", err);
                 }
             });
         }
@@ Expand Down @@