mirror of
https://github.com/RGBCube/uutils-coreutils
synced 2025-07-29 12:07:46 +00:00
Fixed panic!/assert! used with improper format strings
This commit is contained in:
parent
a1b8996ef2
commit
bc426fb3af
2 changed files with 23 additions and 32 deletions
|
@ -166,8 +166,9 @@ mod tests {
|
||||||
let mut input = PeekReader::new(Cursor::new(&data));
|
let mut input = PeekReader::new(Cursor::new(&data));
|
||||||
let mut sut = InputDecoder::new(&mut input, 8, 2, ByteOrder::Little);
|
let mut sut = InputDecoder::new(&mut input, 8, 2, ByteOrder::Little);
|
||||||
|
|
||||||
match sut.peek_read() {
|
// Peek normal length
|
||||||
Ok(mut mem) => {
|
let mut mem = sut.peek_read().unwrap();
|
||||||
|
|
||||||
assert_eq!(8, mem.length());
|
assert_eq!(8, mem.length());
|
||||||
|
|
||||||
assert_eq!(-2.0, mem.read_float(0, 8));
|
assert_eq!(-2.0, mem.read_float(0, 8));
|
||||||
|
@ -185,20 +186,10 @@ mod tests {
|
||||||
|
|
||||||
mem.zero_out_buffer(7, 8);
|
mem.zero_out_buffer(7, 8);
|
||||||
assert_eq!(&[0, 0, 0xff, 0xff], mem.get_full_buffer(6));
|
assert_eq!(&[0, 0, 0xff, 0xff], mem.get_full_buffer(6));
|
||||||
}
|
|
||||||
Err(e) => {
|
|
||||||
assert!(false, e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
match sut.peek_read() {
|
// Peek tail
|
||||||
Ok(mem) => {
|
let mem = sut.peek_read().unwrap();
|
||||||
assert_eq!(2, mem.length());
|
assert_eq!(2, mem.length());
|
||||||
assert_eq!(0xffff, mem.read_uint(0, 2));
|
assert_eq!(0xffff, mem.read_uint(0, 2));
|
||||||
}
|
}
|
||||||
Err(e) => {
|
|
||||||
assert!(false, e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -108,7 +108,7 @@ macro_rules! safe_write(
|
||||||
($fd:expr, $($args:tt)+) => (
|
($fd:expr, $($args:tt)+) => (
|
||||||
match write!($fd, $($args)+) {
|
match write!($fd, $($args)+) {
|
||||||
Ok(_) => {}
|
Ok(_) => {}
|
||||||
Err(f) => panic!(f.to_string())
|
Err(f) => panic!("{}", f)
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
@ -118,7 +118,7 @@ macro_rules! safe_writeln(
|
||||||
($fd:expr, $($args:tt)+) => (
|
($fd:expr, $($args:tt)+) => (
|
||||||
match writeln!($fd, $($args)+) {
|
match writeln!($fd, $($args)+) {
|
||||||
Ok(_) => {}
|
Ok(_) => {}
|
||||||
Err(f) => panic!(f.to_string())
|
Err(f) => panic!("{}", f)
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue