Commit 6c8020f

committed

style: misc clippy fixes

1 parent b02a37d commit 6c8020fCopy full SHA for 6c8020f

File tree

-10

lines changed

-10

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ impl<W: fmt::Write> fmt::Write for DecoratedLog<'_, '_, W> {`
`248`	`248`	`// If the string ends with a newline character, we must 1/propagate it`
`249`	`249`	`// to the output (it was swallowed by the iteration) and 2/prepare to`
`250`	`250`	`// write the log level of the beginning of the next line (if any).`
`251`		`- if letSome('\n') = s.chars().next_back() {`
	`251`	`+ if s.ends_with('\n') {`
`252`	`252`	`writeln!(self.writer)?;`
`253`	`253`	`self.at_line_start = true;`
`254`	`254`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ impl Directory {`
`69`	`69`	`let read_entry_res = self.read_entry(&mut []);`
`70`	`70`
`71`	`71`	`// If no more entries are available, return early.`
`72`		`- if letOk(None) = read_entry_res {`
	`72`	`+ if read_entry_res == Ok(None) {`
`73`	`73`	`return Ok(None);`
`74`	`74`	`}`
`75`	`75`
`@@ -102,7 +102,7 @@ impl Directory {`
`102`	`102`	`let read_entry_res = self.read_entry(&mut []);`
`103`	`103`
`104`	`104`	`// If no more entries are available, return early.`
`105`		`- if letOk(None) = read_entry_res {`
	`105`	`+ if read_entry_res == Ok(None) {`
`106`	`106`	`return Ok(None);`
`107`	`107`	`}`
`108`	`108`

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -429,14 +429,13 @@ impl Tcg {`
`429`	`429`	`data_to_hash: Option<&[u8]>,`
`430`	`430`	`) -> Result {`
`431`	`431`	`let hash_data;`
`432`		`- let hash_data_len;`
`433`		`- if let Some(data_to_hash) = data_to_hash {`
	`432`	`+ let hash_data_len = if let Some(data_to_hash) = data_to_hash {`
`434`	`433`	`hash_data = data_to_hash.as_ptr() as PhysicalAddress;`
`435`		`- hash_data_len = u64::try_from(data_to_hash.len()).unwrap();`
	`434`	`+ u64::try_from(data_to_hash.len()).unwrap()`
`436`	`435`	`} else {`
`437`	`436`	`hash_data = 0;`
`438`		`- hash_data_len = 0;`
`439`		`- }`
	`437`	`+ 0`
	`438`	`+ };`
`440`	`439`
`441`	`440`	`// Don't bother returning these, it's not very useful info.`
`442`	`441`	`let mut event_number = 0;`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -321,14 +321,13 @@ impl Iterator for VariableKeys {`
`321`	`321`	`}))`
`322`	`322`	`}`
`323`	`323`	`Err(err) => {`
	`324`	`+ self.is_done = true;`
`324`	`325`	`if err.status() == Status::NOT_FOUND {`
`325`	`326`	`// This status indicates the end of the list. The final variable`
`326`	`327`	// has already been yielded at this point, so return `None`.
`327`		`- self.is_done = true;`
`328`	`328`	`None`
`329`	`329`	`} else {`
`330`	`330`	`// Return the error and end iteration.`
`331`		`- self.is_done = true;`
`332`	`331`	`Some(Err(err.to_err_without_payload()))`
`333`	`332`	`}`
`334`	`333`	`}`

Comments

(0)