Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: Use unwrap_or_default over unwrap_or_else 

Signed-off-by: Aakash Hemadri <aakashhemadri123@gmail.com>
pull/24376/head
Aakash Hemadri 2021-04-02 11:29:23 +05:30
parent 96a63768f5
commit 3c99ea2187
No known key found for this signature in database
GPG Key ID: 16DDD8A27920964C
1 changed files with 14 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
influxdb2_client/src/api/query.rs
View File

@ -72,10 +72,7 @@ impl Client {
.header("Accepting-Encoding", "identity")
.header("Content-Type", "application/json")
.query(&[("org", &org), ("orgID", &org_id)])
.body(
serde_json::to_string(&query.unwrap_or_else(|| Query::new("".to_string())))
.context(Serializing)?,
)
.body(serde_json::to_string(&query.unwrap_or_default()).context(Serializing)?)
.send()
.await
.context(ReqwestProcessing)?;
@ -99,10 +96,7 @@ impl Client {
let response = self
.request(Method::POST, &req_url)
.header("Content-Type", "application/json")
.body(
serde_json::to_string(&query.unwrap_or_else(|| Query::new("".to_string())))
.context(Serializing)?,
)
.body(serde_json::to_string(&query.unwrap_or_default()).context(Serializing)?)
.send()
.await
.context(ReqwestProcessing)?;
@ -130,10 +124,8 @@ impl Client {
.request(Method::POST, &req_url)
.header("Content-Type", "application/json")
.body(
serde_json::to_string(
&language_request.unwrap_or_else(|| LanguageRequest::new("".to_string())),
)
.context(Serializing)?,
serde_json::to_string(&language_request.unwrap_or_default())
.context(Serializing)?,
)
.send()
.await
@ -208,7 +200,7 @@ mod tests {
.match_query(Matcher::UrlEncoded("org".into(), org.into()))
.match_query(Matcher::UrlEncoded("orgID".into(), org_id.into()))
.match_body(
serde_json::to_string(&query.clone().unwrap_or_else(|| Query::new("".to_string())))
serde_json::to_string(&query.clone().unwrap_or_default())
.unwrap()
.as_str(),
)
@ -235,7 +227,7 @@ mod tests {
.match_query(Matcher::UrlEncoded("org".into(), org.into()))
.match_query(Matcher::UrlEncoded("orgID".into(), org_id.into()))
.match_body(
serde_json::to_string(&query.unwrap_or_else(|| Query::new("".to_string())))
serde_json::to_string(&query.unwrap_or_default())
.unwrap()
.as_str(),
)
@ -256,7 +248,7 @@ mod tests {
.match_header("Authorization", format!("Token {}", token).as_str())
.match_header("Content-Type", "application/json")
.match_body(
serde_json::to_string(&query.clone().unwrap_or_else(|| Query::new("".to_string())))
serde_json::to_string(&query.clone().unwrap_or_default())
.unwrap()
.as_str(),
)
@ -277,7 +269,7 @@ mod tests {
.match_header("Authorization", format!("Token {}", token).as_str())
.match_header("Content-Type", "application/json")
.match_body(
serde_json::to_string(&query.clone().unwrap_or_else(|| Query::new("".to_string())))
serde_json::to_string(&query.clone().unwrap_or_default())
.unwrap()
.as_str(),
)
@ -299,13 +291,9 @@ mod tests {
.match_header("Authorization", format!("Token {}", token).as_str())
.match_header("Content-Type", "application/json")
.match_body(
serde_json::to_string(
&language_request
.clone()
.unwrap_or_else(|| LanguageRequest::new("".to_string())),
)
.unwrap()
.as_str(),
serde_json::to_string(&language_request.clone().unwrap_or_default())
.unwrap()
.as_str(),
)
.create();
@ -324,13 +312,9 @@ mod tests {
.match_header("Authorization", format!("Token {}", token).as_str())
.match_header("Content-Type", "application/json")
.match_body(
serde_json::to_string(
&language_request
.clone()
.unwrap_or_else(|| LanguageRequest::new("".to_string())),
)
.unwrap()
.as_str(),
serde_json::to_string(&language_request.clone().unwrap_or_default())
.unwrap()
.as_str(),
)
.create();