1
1
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
2
- use crate :: deno_error:: err_check;
3
- use crate :: deno_error:: DenoError ;
4
2
use crate :: diagnostics:: Diagnostic ;
5
3
use crate :: msg;
6
4
use crate :: resources;
@@ -9,6 +7,7 @@ use crate::state::*;
9
7
use crate :: tokio_util;
10
8
use crate :: worker:: Worker ;
11
9
use deno:: Buf ;
10
+ use deno:: ErrBox ;
12
11
use deno:: ModuleSpecifier ;
13
12
use futures:: Future ;
14
13
use futures:: Stream ;
@@ -96,7 +95,7 @@ pub fn bundle_async(
96
95
state : ThreadSafeState ,
97
96
module_name : String ,
98
97
out_file : String ,
99
- ) -> impl Future < Item = ( ) , Error = DenoError > {
98
+ ) -> impl Future < Item = ( ) , Error = ErrBox > {
100
99
debug ! (
101
100
"Invoking the compiler to bundle. module_name: {}" ,
102
101
module_name
@@ -116,9 +115,9 @@ pub fn bundle_async(
116
115
// as was done previously.
117
116
state. clone ( ) ,
118
117
) ;
119
- err_check ( worker. execute ( "denoMain()" ) ) ;
120
- err_check ( worker. execute ( "workerMain()" ) ) ;
121
- err_check ( worker. execute ( "compilerMain()" ) ) ;
118
+ worker. execute ( "denoMain()" ) . unwrap ( ) ;
119
+ worker. execute ( "workerMain()" ) . unwrap ( ) ;
120
+ worker. execute ( "compilerMain()" ) . unwrap ( ) ;
122
121
123
122
let resource = worker. state . resource . clone ( ) ;
124
123
let compiler_rid = resource. rid ;
@@ -144,7 +143,7 @@ pub fn bundle_async(
144
143
let json_str = std:: str:: from_utf8 ( & msg) . unwrap ( ) ;
145
144
debug ! ( "Message: {}" , json_str) ;
146
145
if let Some ( diagnostics) = Diagnostic :: from_emit_result ( json_str) {
147
- return Err ( DenoError :: from ( diagnostics) ) ;
146
+ return Err ( ErrBox :: from ( diagnostics) ) ;
148
147
}
149
148
}
150
149
@@ -156,7 +155,7 @@ pub fn bundle_async(
156
155
pub fn compile_async (
157
156
state : ThreadSafeState ,
158
157
module_meta_data : & ModuleMetaData ,
159
- ) -> impl Future < Item = ModuleMetaData , Error = DenoError > {
158
+ ) -> impl Future < Item = ModuleMetaData , Error = ErrBox > {
160
159
let module_name = module_meta_data. module_name . clone ( ) ;
161
160
162
161
debug ! (
@@ -178,9 +177,9 @@ pub fn compile_async(
178
177
// as was done previously.
179
178
state. clone ( ) ,
180
179
) ;
181
- err_check ( worker. execute ( "denoMain()" ) ) ;
182
- err_check ( worker. execute ( "workerMain()" ) ) ;
183
- err_check ( worker. execute ( "compilerMain()" ) ) ;
180
+ worker. execute ( "denoMain()" ) . unwrap ( ) ;
181
+ worker. execute ( "workerMain()" ) . unwrap ( ) ;
182
+ worker. execute ( "compilerMain()" ) . unwrap ( ) ;
184
183
185
184
let compiling_job = state. progress . add ( "Compile" , & module_name) ;
186
185
@@ -211,7 +210,7 @@ pub fn compile_async(
211
210
let json_str = std:: str:: from_utf8 ( & msg) . unwrap ( ) ;
212
211
debug ! ( "Message: {}" , json_str) ;
213
212
if let Some ( diagnostics) = Diagnostic :: from_emit_result ( json_str) {
214
- return Err ( DenoError :: from ( diagnostics) ) ;
213
+ return Err ( ErrBox :: from ( diagnostics) ) ;
215
214
}
216
215
}
217
216
@@ -242,7 +241,7 @@ pub fn compile_async(
242
241
pub fn compile_sync (
243
242
state : ThreadSafeState ,
244
243
module_meta_data : & ModuleMetaData ,
245
- ) -> Result < ModuleMetaData , DenoError > {
244
+ ) -> Result < ModuleMetaData , ErrBox > {
246
245
tokio_util:: block_on ( compile_async ( state, module_meta_data) )
247
246
}
248
247
0 commit comments