twin/ripgrep
1
0
Fork 0
mirror of https://github.com/BurntSushi/ripgrep.git synced 2025-05-19 01:30:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

Whoops. Remove other bits of parking lot.

Browse Source
This commit is contained in:
Andrew Gallant 2016-09-05 19:55:31 -04:00
parent 14b8cd4faf
commit 02ac331529
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main.rs
View File

@ -14,7 +14,6 @@ extern crate log;
extern crate memchr; extern crate memchr;
extern crate memmap; extern crate memmap;
extern crate num_cpus; extern crate num_cpus;
extern crate parking_lot;
extern crate regex; extern crate regex;
extern crate regex_syntax as syntax; extern crate regex_syntax as syntax;
extern crate rustc_serialize; extern crate rustc_serialize;
@ -30,12 +29,11 @@ use std::io;
use std::path::Path; use std::path::Path;
use std::process; use std::process;
use std::result; use std::result;
use std::sync::Arc; use std::sync::{Arc, Mutex};
use std::thread; use std::thread;
use crossbeam::sync::chase_lev::{self, Steal, Stealer}; use crossbeam::sync::chase_lev::{self, Steal, Stealer};
use grep::Grep; use grep::Grep;
use parking_lot::Mutex;
use walkdir::DirEntry; use walkdir::DirEntry;
use args::Args; use args::Args;
@ -199,7 +197,7 @@ impl Worker {
self.do_work(&mut printer, work); self.do_work(&mut printer, work);
let outbuf = printer.into_inner(); let outbuf = printer.into_inner();
if !outbuf.is_empty() { if !outbuf.is_empty() {
let mut out = self.out.lock(); let mut out = self.out.lock().unwrap();
out.write(&outbuf); out.write(&outbuf);
} }
self.outbuf = Some(outbuf); self.outbuf = Some(outbuf);