Skip to content

Commit da16ed6

Browse files
Peter Wilkinsseanmonstar
Peter Wilkins
authored andcommitted
fix(server): allow Server::local_addr to be called with custom executor (#2009)
add generic for the executor to server impl block resolves #1988
1 parent 3d676fb commit da16ed6

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

examples/single_threaded.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,15 @@ fn main() {
3737

3838
let server = Server::bind(&addr)
3939
.executor(exec)
40-
.serve(new_service)
41-
.map_err(|e| eprintln!("server error: {}", e));
40+
.serve(new_service);
4241

4342
println!("Listening on http://{}", addr);
4443

44+
assert_eq!(addr, server.local_addr());
45+
4546
current_thread::Runtime::new()
4647
.expect("rt new")
47-
.spawn(server)
48+
.spawn(server.map_err(|e| eprintln!("server error: {}", e)))
4849
.run()
4950
.expect("rt run");
5051
}

src/server/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ impl Server<AddrIncoming, ()> {
133133
}
134134

135135
#[cfg(feature = "runtime")]
136-
impl<S> Server<AddrIncoming, S> {
136+
impl<S, E> Server<AddrIncoming, S, E> {
137137
/// Returns the local address that this server is bound to.
138138
pub fn local_addr(&self) -> SocketAddr {
139139
self.spawn_all.local_addr()

0 commit comments

Comments
 (0)