summaryrefslogtreecommitdiff
path: root/src/msg.rs
diff options
context:
space:
mode:
authorRyan Dahl <ry@tinyclouds.org>2019-03-14 19:17:52 -0400
committerRyan Dahl <ry@tinyclouds.org>2019-03-18 17:17:08 -0400
commit44773c9b0fe4ae90089c87aa46d049a0a58cccce (patch)
tree34bd66dc66dd59b9acd4bb0a48ea576610187e05 /src/msg.rs
parent33438b83a2a2597c2b9918475dd5362faa5c1728 (diff)
Integrate //core into existing code base
This disables a few tests which are broken still: - tests/error_004_missing_module.test - tests/error_005_missing_dynamic_import.test - tests/error_006_import_ext_failure.test - repl_test test_set_timeout - repl_test test_async_op - repl_test test_set_timeout_interlaced - all of permission_prompt_test
Diffstat (limited to 'src/msg.rs')
-rw-r--r--src/msg.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/msg.rs b/src/msg.rs
index 74027d3d6..080f39de8 100644
--- a/src/msg.rs
+++ b/src/msg.rs
@@ -5,6 +5,7 @@
feature = "cargo-clippy",
allow(clippy::all, clippy::pedantic)
)]
+use crate::isolate_state;
use flatbuffers;
use std::sync::atomic::Ordering;
@@ -12,8 +13,8 @@ use std::sync::atomic::Ordering;
// build_extra/rust/run.py (for the GN+Ninja build).
include!(concat!(env!("GN_OUT_DIR"), "/gen/msg_generated.rs"));
-impl<'a> From<&'a super::isolate::Metrics> for MetricsResArgs {
- fn from(m: &'a super::isolate::Metrics) -> Self {
+impl<'a> From<&'a isolate_state::Metrics> for MetricsResArgs {
+ fn from(m: &'a isolate_state::Metrics) -> Self {
MetricsResArgs {
ops_dispatched: m.ops_dispatched.load(Ordering::SeqCst) as u64,
ops_completed: m.ops_completed.load(Ordering::SeqCst) as u64,