diff options
| -rw-r--r-- | js/errors.ts | 2 | ||||
| -rw-r--r-- | js/fbs_util.ts | 2 | ||||
| -rw-r--r-- | js/fetch.ts | 2 | ||||
| -rw-r--r-- | js/main.ts | 2 | ||||
| -rw-r--r-- | js/os.ts | 2 | ||||
| -rw-r--r-- | js/timers.ts | 2 | ||||
| -rw-r--r-- | src/errors.rs | 4 | ||||
| -rw-r--r-- | src/handlers.rs | 2 | ||||
| -rw-r--r-- | src/main.rs | 2 | ||||
| -rw-r--r-- | src/msg.fbs | 2 |
10 files changed, 9 insertions, 13 deletions
diff --git a/js/errors.ts b/js/errors.ts index 2d0572e6d..ad7b6be21 100644 --- a/js/errors.ts +++ b/js/errors.ts @@ -1,4 +1,4 @@ -import { deno as fbs } from "gen/msg_generated"; +import * as fbs from "gen/msg_generated"; // @internal export class DenoError<T extends fbs.ErrorKind> extends Error { diff --git a/js/fbs_util.ts b/js/fbs_util.ts index 16f3b6ca2..21a3aa04d 100644 --- a/js/fbs_util.ts +++ b/js/fbs_util.ts @@ -2,7 +2,7 @@ // TODO Rename this file to //js/dispatch.ts import { libdeno } from "./libdeno"; import { flatbuffers } from "flatbuffers"; -import { deno as fbs } from "gen/msg_generated"; +import * as fbs from "gen/msg_generated"; import * as errors from "./errors"; import * as util from "./util"; diff --git a/js/fetch.ts b/js/fetch.ts index 20af1d03d..5e1d5c5b0 100644 --- a/js/fetch.ts +++ b/js/fetch.ts @@ -9,7 +9,7 @@ import { } from "./util"; import { flatbuffers } from "flatbuffers"; import { sendAsync } from "./fbs_util"; -import { deno as fbs } from "gen/msg_generated"; +import * as fbs from "gen/msg_generated"; import { Headers, Request, diff --git a/js/main.ts b/js/main.ts index e45562d99..55dca2858 100644 --- a/js/main.ts +++ b/js/main.ts @@ -1,6 +1,6 @@ // Copyright 2018 the Deno authors. All rights reserved. MIT license. import { flatbuffers } from "flatbuffers"; -import { deno as fbs } from "gen/msg_generated"; +import * as fbs from "gen/msg_generated"; import { assert, log, setLogDebug } from "./util"; import * as os from "./os"; import { DenoCompiler } from "./compiler"; @@ -1,6 +1,6 @@ // Copyright 2018 the Deno authors. All rights reserved. MIT license. import { ModuleInfo } from "./types"; -import { deno as fbs } from "gen/msg_generated"; +import * as fbs from "gen/msg_generated"; import { assert } from "./util"; import * as util from "./util"; import { flatbuffers } from "flatbuffers"; diff --git a/js/timers.ts b/js/timers.ts index 6b23c64f1..ee95f7093 100644 --- a/js/timers.ts +++ b/js/timers.ts @@ -1,7 +1,7 @@ // Copyright 2018 the Deno authors. All rights reserved. MIT license. import { assert } from "./util"; import * as util from "./util"; -import { deno as fbs } from "gen/msg_generated"; +import * as fbs from "gen/msg_generated"; import { flatbuffers } from "flatbuffers"; import { send, sendAsync } from "./fbs_util"; diff --git a/src/errors.rs b/src/errors.rs index 2fcb26193..1bedf8d40 100644 --- a/src/errors.rs +++ b/src/errors.rs @@ -1,13 +1,11 @@ // Copyright 2018 the Deno authors. All rights reserved. MIT license. use hyper; -use msg_generated::deno as msg; +pub use msg::ErrorKind; use std; use std::fmt; use std::io; use url; -pub use self::msg::ErrorKind; - pub type DenoResult<T> = std::result::Result<T, DenoError>; #[derive(Debug)] diff --git a/src/handlers.rs b/src/handlers.rs index 477d34774..6977f100e 100644 --- a/src/handlers.rs +++ b/src/handlers.rs @@ -11,7 +11,7 @@ use hyper::rt::{Future, Stream}; use hyper::Client; use libdeno; use libdeno::{deno_buf, DenoC}; -use msg_generated::deno as msg; +use msg; use std; use std::fs; use std::path::Path; diff --git a/src/main.rs b/src/main.rs index ab9a72f79..68e680c71 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,7 +2,7 @@ extern crate flatbuffers; extern crate futures; extern crate hyper; extern crate libc; -extern crate msg_rs as msg_generated; +extern crate msg_rs as msg; extern crate rand; extern crate tempfile; extern crate tokio; diff --git a/src/msg.fbs b/src/msg.fbs index 4afe947d5..5d55253b9 100644 --- a/src/msg.fbs +++ b/src/msg.fbs @@ -1,5 +1,3 @@ -namespace deno; - union Any { Start, StartRes, |