Skip to content

Commit 20742cc

Browse files
committed
restore recent changes, better rusting
1 parent 083cb08 commit 20742cc

File tree

5 files changed

+5778
-1109
lines changed

5 files changed

+5778
-1109
lines changed

compiler-rs/Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

compiler-rs/clients_schema_to_openapi/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ clients_schema = {path="../clients_schema"}
1010
argh = { workspace = true }
1111
derive_more = { version = "2", features = ["from_str"] }
1212
serde_json = { workspace = true }
13-
serde_ignored = { workspace = true }
13+
itertools = { workspace = true }
1414
icu_segmenter = { workspace = true }
1515
openapiv3 = { workspace = true }
1616
anyhow = { workspace = true }

compiler-rs/clients_schema_to_openapi/src/paths.rs

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ use clients_schema::{Privileges, Property};
2323
use indexmap::IndexMap;
2424
use indexmap::indexmap;
2525
use icu_segmenter::SentenceSegmenter;
26+
use itertools::Itertools;
2627
use openapiv3::{
2728
MediaType, Parameter, ParameterData, ParameterSchemaOrContent, PathItem, PathStyle, Paths, QueryStyle, ReferenceOr,
2829
RequestBody, Response, Responses, StatusCode, Example
@@ -322,7 +323,7 @@ pub fn add_endpoint(
322323
deprecated: endpoint.deprecation.is_some(),
323324
security: None,
324325
servers: vec![],
325-
extensions: crate::availability_as_extensions(&endpoint.availability),
326+
extensions
326327
};
327328

328329

@@ -454,15 +455,17 @@ fn split_summary_desc(desc: &str) -> SplitDesc{
454455
fn add_privileges(privileges: &Option<Privileges>) -> Option<String>{
455456
if let Some(privs) = privileges {
456457
let mut result = "\n ##Required authorization\n".to_string();
457-
if privs.index.len()>0 {
458-
result = result + "* Index privileges: " + &privs.index.iter()
459-
.map(|a| {"`".to_string() + a + "`"})
460-
.collect::<Vec<String>>().join(",");
458+
if !privs.index.is_empty() {
459+
result += "* Index privileges: ";
460+
result += &privs.index.iter()
461+
.map(|a| format!("`{a}`"))
462+
.join(",");
461463
}
462-
if privs.cluster.len()>0 {
463-
result = result + " * Cluster privileges: " + &privs.cluster.iter()
464-
.map(|a| {"`".to_string() + a + "`"})
465-
.collect::<Vec<String>>().join(",");
464+
if !privs.cluster.is_empty() {
465+
result += "* Cluster privileges: ";
466+
result += &privs.cluster.iter()
467+
.map(|a| format!("`{a}`"))
468+
.join(",");
466469
}
467470
return Some(result)
468471
}

0 commit comments

Comments
 (0)