StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update needed for Rust v1.77.0" into main am: 2a9674af58

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/3006419

Change-Id: Id229e90dbbaebabc90c0bd76e7950b817325627d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Charisee Chiw
2024-03-27 20:10:07 +00:00
committed by Automerger Merge Worker
parent 10c30669ef 2a9674af58
commit 964668d4c7
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/aconfig/aconfig/src/commands.rs
View File

@@ -317,9 +317,7 @@ pub fn dump_parsed_flags(
} }
fn find_unique_package(parsed_flags: &[ProtoParsedFlag]) -> Option<&str> { fn find_unique_package(parsed_flags: &[ProtoParsedFlag]) -> Option<&str> {
let Some(package) = parsed_flags.first().map(|pf| pf.package()) else { let package = parsed_flags.first().map(|pf| pf.package())?;
return None;
};
if parsed_flags.iter().any(|pf| pf.package() != package) { if parsed_flags.iter().any(|pf| pf.package() != package) {
return None; return None;
} }
@@ -327,9 +325,7 @@ fn find_unique_package(parsed_flags: &[ProtoParsedFlag]) -> Option<&str> {
} }
fn find_unique_container(parsed_flags: &ProtoParsedFlags) -> Option<&str> { fn find_unique_container(parsed_flags: &ProtoParsedFlags) -> Option<&str> {
let Some(container) = parsed_flags.parsed_flag.first().map(|pf| pf.container()) else { let container = parsed_flags.parsed_flag.first().map(|pf| pf.container())?;
return None;
};
if parsed_flags.parsed_flag.iter().any(|pf| pf.container() != container) { if parsed_flags.parsed_flag.iter().any(|pf| pf.container() != container) {
return None; return None;
} }