Add WASM support

Cargo.toml

@@ -50,6 +50,7 @@ num_cpus = "1.8.0"
 regex = "1.3.5"
 serde_json = "1.0.23"
 termcolor = "1.1.0"
+instant = { version = "0.1.12", features = [ "wasm-bindgen" ] }
 
 [dependencies.clap]
 version = "2.33.0"

crates/cli/src/lib.rs

@@ -235,3 +235,8 @@ pub fn is_tty_stdout() -> bool {
 pub fn is_tty_stderr() -> bool {
     atty::is(atty::Stream::Stderr)
 }
+
+#[cfg(not(any(unix, windows)))]
+fn imp() -> bool {
+    false
+}

crates/core/args.rs

@@ -1,3 +1,4 @@
+use instant::SystemTime;
 use std::cmp;
 use std::env;
 use std::ffi::{OsStr, OsString};
@@ -6,7 +7,6 @@ use std::io::{self, Write};
 use std::path::{Path, PathBuf};
 use std::process;
 use std::sync::Arc;
-use std::time::SystemTime;
 
 use clap;
 use grep::cli;

crates/core/main.rs

@@ -1,8 +1,8 @@
+use instant::*;
 use std::error;
 use std::io::{self, Write};
 use std::process;
 use std::sync::Mutex;
-use std::time::Instant;
 
 use ignore::WalkState;
 

crates/core/search.rs

@@ -1,8 +1,8 @@
+use instant::Duration;
 use std::fs::File;
 use std::io;
 use std::path::{Path, PathBuf};
 use std::process::{Command, Stdio};
-use std::time::Duration;
 
 use grep::cli;
 use grep::matcher::Matcher;

crates/ignore/Cargo.toml

@@ -28,6 +28,7 @@ regex = "1.1"
 same-file = "1.0.4"
 thread_local = "1"
 walkdir = "2.2.7"
+instant = { version = "0.1.12", features = [ "wasm-bindgen" ] }
 
 [target.'cfg(windows)'.dependencies.winapi-util]
 version = "0.1.2"

crates/ignore/src/walk.rs

@@ -1,3 +1,4 @@
+use instant::Duration;
 use std::cmp;
 use std::ffi::OsStr;
 use std::fmt;
@@ -7,7 +8,6 @@ use std::path::{Path, PathBuf};
 use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
 use std::sync::{Arc, Mutex};
 use std::thread;
-use std::time::Duration;
 use std::vec;
 
 use same_file::Handle;

crates/printer/Cargo.toml

@@ -26,6 +26,7 @@ grep-searcher = { version = "0.1.8", path = "../searcher" }
 termcolor = "1.0.4"
 serde = { version = "1.0.77", optional = true, features = ["derive"] }
 serde_json = { version = "1.0.27", optional = true }
+instant = { version = "0.1.12", features = [ "wasm-bindgen" ] }
 
 [dev-dependencies]
 grep-regex = { version = "0.1.9", path = "../regex" }

crates/printer/src/json.rs

@@ -1,6 +1,6 @@
+use instant::*;
 use std::io::{self, Write};
 use std::path::Path;
-use std::time::Instant;
 
 use grep_matcher::{Match, Matcher};
 use grep_searcher::{

crates/printer/src/standard.rs

@@ -1,9 +1,9 @@
+use instant::Instant;
 use std::cell::{Cell, RefCell};
 use std::cmp;
 use std::io::{self, Write};
 use std::path::Path;
 use std::sync::Arc;
-use std::time::Instant;
 
 use bstr::ByteSlice;
 use grep_matcher::{Match, Matcher};
@@ -1702,7 +1702,7 @@ and exhibited clearly, with a label attached.\
 
     #[test]
     fn reports_stats() {
-        use std::time::Duration;
+        use instant::Duration;
 
         let matcher = RegexMatcher::new("Sherlock|opposed").unwrap();
         let mut printer =
@@ -1729,7 +1729,7 @@ and exhibited clearly, with a label attached.\
 
     #[test]
     fn reports_stats_multiple() {
-        use std::time::Duration;
+        use instant::Duration;
 
         let matcher = RegexMatcher::new("Sherlock|opposed").unwrap();
         let mut printer =

crates/printer/src/stats.rs

@@ -1,5 +1,5 @@
+use instant::Duration;
 use std::ops::{Add, AddAssign};
-use std::time::Duration;
 
 use crate::util::NiceDuration;
 

crates/printer/src/summary.rs

@@ -1,8 +1,8 @@
+use instant::Instant;
 use std::cell::RefCell;
 use std::io::{self, Write};
 use std::path::Path;
 use std::sync::Arc;
-use std::time::Instant;
 
 use grep_matcher::Matcher;
 use grep_searcher::{Searcher, Sink, SinkError, SinkFinish, SinkMatch};

crates/printer/src/util.rs

@@ -1,8 +1,8 @@
+use instant::*;
 use std::borrow::Cow;
 use std::fmt;
 use std::io;
 use std::path::Path;
-use std::time;
 
 use bstr::{ByteSlice, ByteVec};
 use grep_matcher::{Captures, LineTerminator, Match, Matcher};
@@ -327,7 +327,7 @@ impl<'a> PrinterPath<'a> {
 /// with the Deserialize impl for std::time::Duration, since this type only
 /// adds new fields.
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
-pub struct NiceDuration(pub time::Duration);
+pub struct NiceDuration(pub Duration);
 
 impl fmt::Display for NiceDuration {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

tests/json.rs

@@ -1,5 +1,3 @@
-use std::time;
-
 use serde_derive::Deserialize;
 use serde_json as json;
 
@@ -130,7 +128,7 @@ struct Stats {
 #[derive(Clone, Debug, Deserialize, PartialEq, Eq)]
 struct Duration {
     #[serde(flatten)]
-    duration: time::Duration,
+    duration: instant::Duration,
     human: String,
 }
 

tests/util.rs

@@ -1,3 +1,4 @@
+use instant::Duration;
 use std::env;
 use std::error;
 use std::ffi::OsStr;
@@ -7,7 +8,6 @@ use std::path::{Path, PathBuf};
 use std::process::{self, Command};
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::thread;
-use std::time::Duration;
 
 static TEST_DIR: &'static str = "ripgrep-tests";
 static NEXT_ID: AtomicUsize = AtomicUsize::new(0);