Skip to content

Clarify platform selection internals in CLI utils #690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
viktorking7 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Clarify platform selection internals in CLI utils #690

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions cli/src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,12 @@ impl PlatformSelector {
.iter()
.map(|&i| {
let p = Platform::from_idx(i);
// `target_platforms` was initialized to `Some(HashSet::new())` above, so
// `get_or_insert_with` is redundant here and makes the intent harder to read.
config
.target_platforms
.get_or_insert_with(HashSet::new)
.as_mut()
.unwrap()
.insert(p.as_str().to_string());
p
})
Expand All @@ -74,7 +77,7 @@ impl PlatformSelector {
/// For the better UX - users don't need to select again if failed build happens in the next step,
/// `select_archs` updates `ios` and `android` in the config file.
pub fn select_archs(&mut self, config: &mut Config) -> HashMap<String, Vec<String>> {
let mut archs: HashMap<String, Vec<String>> = HashMap::new();
let mut selected_archs_by_platform: HashMap<String, Vec<String>> = HashMap::new();
Self::print_architecture_message();
self.platforms.iter().for_each(|&p| match p {
Platform::Ios => {
Expand Down Expand Up @@ -106,7 +109,7 @@ impl PlatformSelector {
arch.clone()
})
.collect::<Vec<String>>();
archs.insert(String::from(Platform::Ios.as_str()), sel_str.clone());
selected_archs_by_platform.insert(String::from(Platform::Ios.as_str()), sel_str.clone());
self.archs.extend_from_slice(&sel_str);
}
Platform::Android => {
Expand Down Expand Up @@ -138,12 +141,12 @@ impl PlatformSelector {
arch.clone()
})
.collect::<Vec<String>>();
archs.insert(String::from(Platform::Android.as_str()), sel_str.clone());
selected_archs_by_platform.insert(String::from(Platform::Android.as_str()), sel_str.clone());
self.archs.extend_from_slice(&sel_str);
}
Platform::Web => {}
});
archs
selected_archs_by_platform
}

fn select_multi_archs(platform: &str, archs: &[&str], defaults: Vec<bool>) -> Vec<usize> {
Expand Down
Loading