Fixed builds and updated macro import to 2018 edition

boa-dev · Apr 16, 2020 · 63b0014 · 63b0014
1 parent d532783
commit 63b0014
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 24 deletions.
diff --git a/boa/benches/exec.rs b/boa/benches/exec.rs
@@ -1,9 +1,7 @@
-#[macro_use]
-extern crate criterion;
+//! Benchmarks of the whole execution engine in Boa.
 
-use boa::exec;
-use boa::realm::Realm;
-use criterion::{black_box, Criterion};
+use boa::{exec, realm::Realm};
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
 
 static SYMBOL_CREATION: &str = r#"
 let a = Symbol();
@@ -65,10 +63,10 @@ fn fibonacci(c: &mut Criterion) {
 }
 
 criterion_group!(
-    benches,
+    execution,
     create_realm,
     symbol_creation,
     for_loop_execution,
-    fibonnaci
+    fibonacci
 );
-criterion_main!(benches);
+criterion_main!(execution);
diff --git a/boa/benches/lexer.rs b/boa/benches/lexer.rs
@@ -1,11 +1,7 @@
-#[macro_use]
-extern crate criterion;
+//! Benchmarks of the lexing process in Boa.
 
-use boa::exec;
 use boa::syntax::lexer::Lexer;
-use boa::syntax::parser::Parser;
-use criterion::black_box;
-use criterion::Criterion;
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
 
 static EXPRESSION: &str = r#"
 1 + 1 + 1 + 1 + 1 + 1 / 1 + 1 + 1 * 1 + 1 + 1 + 1;
@@ -56,5 +52,5 @@ fn for_loop_lexer(c: &mut Criterion) {
     });
 }
 
-criterion_group!(benches, expression_lexer, hello_world_lexer, for_loop_lexer);
-criterion_main!(benches);
+criterion_group!(lexer, expression_lexer, hello_world_lexer, for_loop_lexer);
+criterion_main!(lexer);
diff --git a/boa/benches/parser.rs b/boa/benches/parser.rs
@@ -1,17 +1,15 @@
-#[macro_use]
-extern crate criterion;
+//! Benchmarks of the parsing process in Boa.
 
-use boa::syntax::lexer::Lexer;
-use boa::syntax::parser::Parser;
-use criterion::black_box;
-use criterion::Criterion;
+use boa::syntax::{lexer::Lexer, parser::Parser};
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
 
 static EXPRESSION: &str = r#"
 1 + 1 + 1 + 1 + 1 + 1 / 1 + 1 + 1 * 1 + 1 + 1 + 1;
 "#;
 
 fn expression_parser(c: &mut Criterion) {
     // We include the lexing in the benchmarks, since they will get together soon, anyways.
+
     c.bench_function("Expression (Parser)", move |b| {
         b.iter(|| {
             let mut lexer = Lexer::new(black_box(EXPRESSION));
@@ -26,6 +24,7 @@ static HELLO_WORLD: &str = "let foo = 'hello world!'; foo;";
 
 fn hello_world_parser(c: &mut Criterion) {
     // We include the lexing in the benchmarks, since they will get together soon, anyways.
+
     c.bench_function("Hello World (Parser)", move |b| {
         b.iter(|| {
             let mut lexer = Lexer::new(black_box(HELLO_WORLD));
@@ -62,9 +61,9 @@ fn for_loop_parser(c: &mut Criterion) {
 }
 
 criterion_group!(
-    benches,
+    parser,
     expression_parser,
     hello_world_parser,
     for_loop_parser
 );
-criterion_main!(benches);
+criterion_main!(parser);