rust-filepatterns: fix type of warnings tuple to (bytes, bytes)
Otherwise warn() in match.py would fail if the warning contains non-ASCII
character.
We might want to add a thin ByteString wrapper around Vec<u8> to
implement ToPyObject<ObjectType = PyBytes>, but I'm not sure.
--- a/rust/hg-core/src/filepatterns.rs Sun Jul 21 13:48:29 2019 +0900
+++ b/rust/hg-core/src/filepatterns.rs Sun Jul 21 12:46:57 2019 +0900
@@ -227,7 +227,7 @@
}
pub type PatternTuple = (Vec<u8>, LineNumber, Vec<u8>);
-type WarningTuple = (String, String);
+type WarningTuple = (Vec<u8>, Vec<u8>);
pub fn parse_pattern_file_contents(
lines: &[u8],
@@ -263,10 +263,7 @@
if let Some(rel_syntax) = SYNTAXES.get(syntax) {
current_syntax = rel_syntax;
} else if warn {
- warnings.push((
- String::from_utf8_lossy(file_path).to_string(),
- String::from_utf8_lossy(syntax).to_string(),
- ));
+ warnings.push((file_path.to_owned(), syntax.to_owned()));
}
continue;
}
--- a/rust/hg-cpython/src/filepatterns.rs Sun Jul 21 13:48:29 2019 +0900
+++ b/rust/hg-cpython/src/filepatterns.rs Sun Jul 21 12:46:57 2019 +0900
@@ -40,17 +40,31 @@
};
let results: Vec<(PyBytes, LineNumber, PyBytes)> =
patterns.iter().map(itemgetter).collect();
- return Ok((results, warnings).to_py_object(py));
+ return Ok((results, warnings_to_py_bytes(py, &warnings))
+ .to_py_object(py));
}
let itemgetter = |x: &PatternTuple| PyBytes::new(py, &x.0);
let results: Vec<PyBytes> =
patterns.iter().map(itemgetter).collect();
- Ok((results, warnings).to_py_object(py))
+ Ok(
+ (results, warnings_to_py_bytes(py, &warnings))
+ .to_py_object(py),
+ )
}
Err(e) => Err(PatternFileError::pynew(py, e)),
}
}
+fn warnings_to_py_bytes(
+ py: Python,
+ warnings: &[(Vec<u8>, Vec<u8>)],
+) -> Vec<(PyBytes, PyBytes)> {
+ warnings
+ .iter()
+ .map(|(path, syn)| (PyBytes::new(py, path), PyBytes::new(py, syn)))
+ .collect()
+}
+
fn build_single_regex_wrapper(
py: Python,
kind: PyObject,