Skip to content

Prefer iterators #1088

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

Merged
merged 3 commits into from
Sep 8, 2022
Merged

Prefer iterators #1088

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
edc92cf
use iterator instead of for loop
rylev Sep 8, 2022
30ba51d
Don't clone so early
rylev Sep 8, 2022
d3124fb
More iterators
rylev Sep 8, 2022
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
42 changes: 22 additions & 20 deletions services/autorust/codegen/src/codegen_operations.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,14 +329,12 @@ impl WebOperationGen {
})
}

pub fn success_responses(&self) -> IndexMap<StatusCode, Response> {
let mut map = IndexMap::new();
for (status_code, rsp) in &self.0.responses {
if crate::status_codes::is_success(status_code) {
map.insert(status_code.to_owned(), rsp.to_owned());
}
}
map
pub fn success_responses(&self) -> IndexMap<&StatusCode, &Response> {
self.0
.responses
.iter()
.filter(|(status_code, _)| crate::status_codes::is_success(status_code))
.collect()
}
}

Expand Down Expand Up @@ -780,23 +778,27 @@ struct StatusResponseCode {

impl ResponseCode {
fn new(operation: &WebOperationGen, produces: String) -> Result<Self> {
let mut status_responses = Vec::new();
let success_responses = operation.success_responses();
for (status_code, rsp) in &success_responses {
status_responses.push(StatusResponseCode {
status_code_name: get_status_code_ident(status_code)?,
response_type: create_response_type(rsp)?,
});
}
let status_responses = success_responses
.iter()
.map(|(status_code, rsp)| {
Ok(StatusResponseCode {
status_code_name: get_status_code_ident(status_code)?,
response_type: create_response_type(rsp)?,
})
})
.collect::<Result<Vec<_>>>()?;

let headers = success_responses
.into_iter()
.flat_map(|(_, rsp)| rsp.headers)
.iter()
.flat_map(|(_, rsp)| &rsp.headers)
.filter_map(|(name, header)| match header {
autorust_openapi::ReferenceOr::Item(header) => Some((name.clone(), HeaderCode::new(name, &header))),
autorust_openapi::ReferenceOr::Item(header) => Some((name.clone(), HeaderCode::new(name.clone(), header))),
_ => None,
})
.collect::<IndexMap<_, _>>();
let headers = headers.into_values().collect::<Result<Vec<_>>>()?;
.collect::<IndexMap<_, _>>()
.into_values()
.collect::<Result<Vec<_>>>()?;
Ok(Self {
status_responses,
pageable: operation.pageable(),
Expand Down