From 5c1deac0cfe66ef27020aa0e863c16f3bc2afb50 Mon Sep 17 00:00:00 2001 From: Ry Dahl Date: Wed, 6 Nov 2019 12:17:28 -0500 Subject: Remove CoreResource::inspect_repr method (#3274) Towards simplifying (or better removing entirely) the CoreResource trait. Resources should be any bit of privileged heap allocated memory that needs to be referenced from JS, not very specific trait implementations. Therefore CoreResource should be pushed towards being as general as possible. --- core/examples/http_bench.rs | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'core/examples') diff --git a/core/examples/http_bench.rs b/core/examples/http_bench.rs index 764e04303..8635d4f23 100644 --- a/core/examples/http_bench.rs +++ b/core/examples/http_bench.rs @@ -190,19 +190,11 @@ pub fn bad_resource() -> Error { struct TcpListener(tokio::net::TcpListener); -impl Resource for TcpListener { - fn inspect_repr(&self) -> &str { - "tcpListener" - } -} +impl Resource for TcpListener {} struct TcpStream(tokio::net::TcpStream); -impl Resource for TcpStream { - fn inspect_repr(&self) -> &str { - "tcpStream" - } -} +impl Resource for TcpStream {} lazy_static! { static ref RESOURCE_TABLE: Mutex = @@ -225,7 +217,7 @@ fn op_accept(record: Record, _zero_copy_buf: Option) -> Box { .and_then(move |(stream, addr)| { debug!("accept success {}", addr); let mut table = lock_resource_table(); - let rid = table.add(Box::new(TcpStream(stream))); + let rid = table.add("tcpStream", Box::new(TcpStream(stream))); Ok(rid as i32) }); Box::new(fut) @@ -239,7 +231,7 @@ fn op_listen( let addr = "127.0.0.1:4544".parse::().unwrap(); let listener = tokio::net::TcpListener::bind(&addr).unwrap(); let mut table = lock_resource_table(); - let rid = table.add(Box::new(TcpListener(listener))); + let rid = table.add("tcpListener", Box::new(TcpListener(listener))); Box::new(futures::future::ok(rid as i32)) } -- cgit v1.2.3