diff options
author | Charisee Chiw <chiw@google.com> | 2024-03-27 19:53:54 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-27 19:53:54 +0000 |
commit | 2a9674af5828132bf887f6d0399d2a75f886135a (patch) | |
tree | 714b71da556e92e707007db660472338a4a9dc80 | |
parent | bb508889871ef017176880568a460fed95179226 (diff) | |
parent | 58708f5d7b91c53be31a0c12aa81c2e332872244 (diff) | |
download | build-2a9674af5828132bf887f6d0399d2a75f886135a.tar.gz |
Merge "Update needed for Rust v1.77.0" into main
-rw-r--r-- | tools/aconfig/aconfig/src/commands.rs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tools/aconfig/aconfig/src/commands.rs b/tools/aconfig/aconfig/src/commands.rs index 98dde4455f..7736ce75ee 100644 --- a/tools/aconfig/aconfig/src/commands.rs +++ b/tools/aconfig/aconfig/src/commands.rs @@ -317,9 +317,7 @@ pub fn dump_parsed_flags( } fn find_unique_package(parsed_flags: &[ProtoParsedFlag]) -> Option<&str> { - let Some(package) = parsed_flags.first().map(|pf| pf.package()) else { - return None; - }; + let package = parsed_flags.first().map(|pf| pf.package())?; if parsed_flags.iter().any(|pf| pf.package() != package) { return None; } @@ -327,9 +325,7 @@ fn find_unique_package(parsed_flags: &[ProtoParsedFlag]) -> Option<&str> { } fn find_unique_container(parsed_flags: &ProtoParsedFlags) -> Option<&str> { - let Some(container) = parsed_flags.parsed_flag.first().map(|pf| pf.container()) else { - return None; - }; + let container = parsed_flags.parsed_flag.first().map(|pf| pf.container())?; if parsed_flags.parsed_flag.iter().any(|pf| pf.container() != container) { return None; } |