From 02ac331529e2570b48ffcd4a735ad8bccb0cb72c Mon Sep 17 00:00:00 2001 From: Andrew Gallant Date: Mon, 5 Sep 2016 19:55:31 -0400 Subject: [PATCH] Whoops. Remove other bits of parking lot. --- src/main.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main.rs b/src/main.rs index b01633b5..55be1969 100644 --- a/src/main.rs +++ b/src/main.rs @@ -14,7 +14,6 @@ extern crate log; extern crate memchr; extern crate memmap; extern crate num_cpus; -extern crate parking_lot; extern crate regex; extern crate regex_syntax as syntax; extern crate rustc_serialize; @@ -30,12 +29,11 @@ use std::io; use std::path::Path; use std::process; use std::result; -use std::sync::Arc; +use std::sync::{Arc, Mutex}; use std::thread; use crossbeam::sync::chase_lev::{self, Steal, Stealer}; use grep::Grep; -use parking_lot::Mutex; use walkdir::DirEntry; use args::Args; @@ -199,7 +197,7 @@ impl Worker { self.do_work(&mut printer, work); let outbuf = printer.into_inner(); if !outbuf.is_empty() { - let mut out = self.out.lock(); + let mut out = self.out.lock().unwrap(); out.write(&outbuf); } self.outbuf = Some(outbuf);