Commit25c169e

committed

style: replace manual bounds checks withslice::split_at_checked

1 parent96ef3d8 commit25c169eCopy full SHA for 25c169e

File tree

-13

lines changed

-13

lines changed

Lines changed: 5 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -639,11 +639,10 @@ impl<'a> FallibleIterator for ArrayValues<'a> {`
`639`	`639`	`let val =if len <0{`
`640`	`640`	`None`
`641`	`641`	`}else{`
`642`		`-ifself.buf.len() < lenasusize{`
`643`		`-returnErr("invalid value length".into());`
`644`		`-}`
`645`		`-`
`646`		`-let(val, buf) =self.buf.split_at(lenasusize);`
	`642`	`+let(val, buf) =self`
	`643`	`+.buf`
	`644`	`+.split_at_checked(lenasusize)`
	`645`	`+.ok_or("invalid value length")?;`
`647`	`646`	`self.buf = buf;`
`648`	`647`	`Some(val)`
`649`	`648`	`};`
`@@ -771,10 +770,7 @@ fn read_bound<'a>(`
`771`	`770`	`None`
`772`	`771`	`}else{`
`773`	`772`	`let len = lenasusize;`
`774`		`-if buf.len() < len{`
`775`		`-returnErr("invalid message size".into());`
`776`		`-}`
`777`		`-let(value, tail) = buf.split_at(len);`
	`773`	`+let(value, tail) = buf.split_at_checked(len).ok_or("invalid message size")?;`
`778`	`774`	`*buf = tail;`
`779`	`775`	`Some(value)`
`780`	`776`	`};`

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,9 @@ where`
`23`	`23`	`let value =if len <0{`
`24`	`24`	`None`
`25`	`25`	`}else{`
`26`		`-if lenasusize > buf.len(){`
`27`		`-returnErr("invalid buffer size".into());`
`28`		`-}`
`29`		`-let(head, tail) = buf.split_at(lenasusize);`
	`26`	`+let(head, tail) = buf`
	`27`	`+.split_at_checked(lenasusize)`
	`28`	`+.ok_or("invalid buffer size")?;`
`30`	`29`	`*buf = tail;`
`31`	`30`	`Some(head)`
`32`	`31`	`};`

Comments

(0)