dolysis
/
yary
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Feature/scanner/option #27

Merged
bazaah merged 19 commits from feature/scanner/option into master 2021-09-09 19:29:29 +00:00
Conversation 1 Commits 19 Files Changed 16 +7 -6
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 39b33ccd7e - Show all commits

13
src/scanner/scalar/escape.rs
View File

@ -239,6 +239,7 @@ mod tests
use pretty_assertions::assert_eq; use pretty_assertions::assert_eq;
use super::*; use super::*;
use crate::scanner::flag::O_ZEROED;
type TestResult = anyhow::Result<()>; type TestResult = anyhow::Result<()>;
@ -283,7 +284,7 @@ mod tests
for (i, (&t, &ex)) in data.into_iter().zip(expected).enumerate() for (i, (&t, &ex)) in data.into_iter().zip(expected).enumerate()
{ {
scratch.clear(); scratch.clear();
flow_unescape(t, scratch) flow_unescape(O_ZEROED, t, scratch)
.map_err(|e| anyhow!("on iteration {}, test errored with {}", i, e))?; .map_err(|e| anyhow!("on iteration {}, test errored with {}", i, e))?;
assert_eq!(scratch, ex, "on iteration {}", i) assert_eq!(scratch, ex, "on iteration {}", i)
@ -344,7 +345,7 @@ mod tests
let mut c: [u8; 4] = [0; 4]; let mut c: [u8; 4] = [0; 4];
scratch.clear(); scratch.clear();
flow_unescape(t, scratch) flow_unescape(O_ZEROED, t, scratch)
.map_err(|e| anyhow!("on iteration {}, test errored with {}", i, e))?; .map_err(|e| anyhow!("on iteration {}, test errored with {}", i, e))?;
assert_eq!( assert_eq!(
@ -385,7 +386,7 @@ mod tests
{ {
scratch.clear(); scratch.clear();
let consumed = flow_unescape(t, scratch) let consumed = flow_unescape(O_ZEROED, t, scratch)
.map_err(|e| anyhow!("on iteration {}, test errored with {}", i, e))?; .map_err(|e| anyhow!("on iteration {}, test errored with {}", i, e))?;
assert_eq!( assert_eq!(
@ -432,7 +433,7 @@ mod tests
{ {
scratch.clear(); scratch.clear();
let consumed = tag_uri_unescape(t, scratch, true) let consumed = tag_uri_unescape(O_ZEROED, t, scratch, true)
.map_err(|e| anyhow!("on iteration {}, test errored with {}", i, e))?; .map_err(|e| anyhow!("on iteration {}, test errored with {}", i, e))?;
assert_eq!( assert_eq!(
@ -461,7 +462,7 @@ mod tests
let scratch = &mut Vec::new(); let scratch = &mut Vec::new();
let expected = ScanError::UnexpectedEOF; let expected = ScanError::UnexpectedEOF;
match tag_uri_unescape(data, scratch, true) match tag_uri_unescape(O_ZEROED, data, scratch, true)
{ {
Err(e) if e == expected => Ok(()), Err(e) if e == expected => Ok(()),
@ -481,7 +482,7 @@ mod tests
let scratch = &mut Vec::new(); let scratch = &mut Vec::new();
let expected = ScanError::UnknownEscape; let expected = ScanError::UnknownEscape;
match tag_uri_unescape(data, scratch, true) match tag_uri_unescape(O_ZEROED, data, scratch, true)
{ {
Err(e) if e == expected => Ok(()), Err(e) if e == expected => Ok(()),