luxolus
/
pyo3
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update word count example

This commit is contained in:
Nikolay Kim 2017-07-26 09:18:50 -07:00
parent b250ad22ca
commit 823054052d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
examples/word-count/src/lib.rs
View File

@ -8,7 +8,7 @@ use std::fs::File;
use std::io::prelude::*;
use rayon::prelude::*;
use pyo3::{py, PyResult, Python, PyModule, ToPyErr};
use pyo3::{py, PyResult, Python, PyModule};
fn matches(word: &str, search: &str) -> bool {
let mut search = search.chars();
@ -52,19 +52,19 @@ fn init_mod(py: Python, m: &PyModule) -> PyResult<()> {
#[pyfn(m, "search")]
fn search(py: Python, path: String, search: String) -> PyResult<i32> {
let mut file = File::open(path).map_err(|e| e.to_pyerr(py))?;
let mut file = File::open(path)?;
let mut contents = String::new();
file.read_to_string(&mut contents).map_err(|e| e.to_pyerr(py))?;
file.read_to_string(&mut contents)?;
let count = py.allow_threads(move || wc_parallel(&contents, &search));
Ok(count)
}
#[pyfn(m, "search_sequential")]
fn search_sequential(py: Python, path: String, search: String) -> PyResult<i32> {
let mut file = File::open(path).map_err(|e| e.to_pyerr(py))?;
fn search_sequential(path: String, search: String) -> PyResult<i32> {
let mut file = File::open(path)?;
let mut contents = String::new();
file.read_to_string(&mut contents).map_err(|e| e.to_pyerr(py))?;
file.read_to_string(&mut contents)?;
Ok(wc_sequential(&contents, &search))
}