Skip to content

Format code using rustfmt for 5fdfb5a6c8e3b6d641c1a429213ab2aea9c98ad8 #24

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
github-actions wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −9
Open

Format code using rustfmt for 5fdfb5a6c8e3b6d641c1a429213ab2aea9c98ad8 #24

Show file tree
Hide file tree
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
4 changes: 1 addition & 3 deletions src/core/context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ pub fn init(quiet: bool, verbose: bool, no_color: bool, no_spinner: bool, assume
ASSUME_YES.store(assume_yes, Ordering::SeqCst);

let stdout_is_tty = std::io::stdout().is_terminal();
let color_enabled = !no_color
&& stdout_is_tty
&& std::env::var_os("NO_COLOR").is_none();
let color_enabled = !no_color && stdout_is_tty && std::env::var_os("NO_COLOR").is_none();
COLOR_MODE.store(color_enabled, Ordering::SeqCst);
colored::control::set_override(color_enabled);

Expand Down
15 changes: 9 additions & 6 deletions src/core/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use super::context;
use anyhow::{Context, Result};
use chrono::{DateTime, Utc};
use serde::Serialize;
use std::io::{self, Write};
use super::context;

pub fn mask_if_empty(value: &str, fallback: &str) -> String {
if value.trim().is_empty() {
Expand Down Expand Up @@ -102,7 +102,10 @@ fn response_error(value: &serde_json::Value) -> Option<anyhow::Error> {
}
} else if let Some(status) = value.get("status").and_then(|s| s.as_u64()) {
if status >= 400 {
let title = value.get("title").and_then(|t| t.as_str()).unwrap_or("Error");
let title = value
.get("title")
.and_then(|t| t.as_str())
.unwrap_or("Error");
let detail = value.get("detail").and_then(|d| d.as_str());

if let Some(d) = detail {
Expand Down Expand Up @@ -148,8 +151,8 @@ pub fn handle_json_response<T: serde::de::DeserializeOwned + Serialize>(
}
};
let data: T = serde_json::from_value(data_val.clone()).map_err(|e| {
let data_str = serde_json::to_string_pretty(data_val)
.unwrap_or_else(|_| data_val.to_string());
let data_str =
serde_json::to_string_pretty(data_val).unwrap_or_else(|_| data_val.to_string());
anyhow::anyhow!(
"failed to parse response data: {}\nData being parsed: {}",
e,
Expand Down Expand Up @@ -188,8 +191,8 @@ pub fn handle_paginated_response<T: serde::de::DeserializeOwned + Serialize>(

let result: crate::types::base::Paginated<T> =
serde_json::from_value(value.clone()).map_err(|e| {
let data_str = serde_json::to_string_pretty(&value)
.unwrap_or_else(|_| value.to_string());
let data_str =
serde_json::to_string_pretty(&value).unwrap_or_else(|_| value.to_string());
anyhow::anyhow!(
"failed to parse response data: {}\nData being parsed: {}",
e,
Expand Down