1
0
mirror of https://github.com/google/comprehensive-rust.git synced 2025-04-25 00:50:26 +02:00

Apply clippy::semicolon_if_nothing_returned (#2410)

This is for consistency: if a block returns `()`, and the last
expression of the block also returns `()`, then the final `;` can be
left out.

However, this is a little confusing (I was asked about this in a class
today) and it is inconsistent.

See

https://rust-lang.github.io/rust-clippy/master/index.html#/semicolon_if_nothing_returned
for details.
This commit is contained in:
Martin Geisler 2024-10-21 13:57:01 -04:00 committed by GitHub
parent 3d1339c546
commit ec6cb024e8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 11 deletions

View File

@ -92,7 +92,7 @@ impl<const N: usize> fmt::Display for Table<N> {
self.write_row(f, self.header.iter().map(|s| s.as_str()))?; self.write_row(f, self.header.iter().map(|s| s.as_str()))?;
self.write_row(f, self.header.iter().map(|_| "-"))?; self.write_row(f, self.header.iter().map(|_| "-"))?;
for row in &self.rows { for row in &self.rows {
self.write_row(f, row.iter().map(|s| s.as_str()))? self.write_row(f, row.iter().map(|s| s.as_str()))?;
} }
Ok(()) Ok(())
} }
@ -156,42 +156,42 @@ mod test {
#[test] #[test]
fn duration_no_time() { fn duration_no_time() {
assert_eq!(duration(0), "0 minutes") assert_eq!(duration(0), "0 minutes");
} }
#[test] #[test]
fn duration_single_minute() { fn duration_single_minute() {
assert_eq!(duration(1), "1 minute") assert_eq!(duration(1), "1 minute");
} }
#[test] #[test]
fn duration_two_minutes() { fn duration_two_minutes() {
assert_eq!(duration(2), "2 minutes") assert_eq!(duration(2), "2 minutes");
} }
#[test] #[test]
fn duration_seven_minutes() { fn duration_seven_minutes() {
assert_eq!(duration(7), "10 minutes") assert_eq!(duration(7), "10 minutes");
} }
#[test] #[test]
fn duration_hour() { fn duration_hour() {
assert_eq!(duration(60), "1 hour") assert_eq!(duration(60), "1 hour");
} }
#[test] #[test]
fn duration_hour_mins() { fn duration_hour_mins() {
assert_eq!(duration(61), "1 hour and 5 minutes") assert_eq!(duration(61), "1 hour and 5 minutes");
} }
#[test] #[test]
fn duration_hours() { fn duration_hours() {
assert_eq!(duration(120), "2 hours") assert_eq!(duration(120), "2 hours");
} }
#[test] #[test]
fn duration_hours_mins() { fn duration_hours_mins() {
assert_eq!(duration(130), "2 hours and 10 minutes") assert_eq!(duration(130), "2 hours and 10 minutes");
} }
#[test] #[test]

View File

@ -29,5 +29,5 @@ fn main() {
); );
binder::add_service(SERVICE_IDENTIFIER, birthday_service_binder.as_binder()) binder::add_service(SERVICE_IDENTIFIER, birthday_service_binder.as_binder())
.expect("Failed to register service"); .expect("Failed to register service");
binder::ProcessState::join_thread_pool() binder::ProcessState::join_thread_pool();
} }

View File

@ -23,5 +23,5 @@ fn main() {
.file("entry.S") .file("entry.S")
.file("exceptions.S") .file("exceptions.S")
.file("idmap.S") .file("idmap.S")
.compile("empty") .compile("empty");
} }