Skip to content

Commit a16470d

Browse files
coolreader18coolreader18
committed
Run cargo clippy --all-targets --workspace --fix && cargo fmt
1 parent df3f8b3 commit a16470d

File tree

43 files changed

+707
-751
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+707
-751
lines changed

‎crates/auth/src/identity.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,12 @@ impl TryInto<SpacetimeIdentityClaims> for IncomingClaims {
115115

116116
let computed_identity = Identity::from_claims(&self.issuer, &self.subject);
117117
// If an identity is provided, it must match the computed identity.
118-
if let Some(token_identity) = self.identity {
119-
if token_identity != computed_identity {
120-
return Err(anyhow::anyhow!(
118+
if let Some(token_identity) = self.identity
119+
&& token_identity != computed_identity
120+
{
121+
return Err(anyhow::anyhow!(
121122
"Identity mismatch: token identity {token_identity:?} does not match computed identity {computed_identity:?}",
122123
));
123-
}
124124
}
125125

126126
Ok(SpacetimeIdentityClaims {

‎crates/bench/src/sqlite.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,10 +226,10 @@ fn memo_query<F: FnOnce() -> String>(bench_name: BenchName, table_id: &str, gene
226226
// fast path
227227
let queries = QUERIES.read().unwrap();
228228

229-
if let Some(bench_queries) = queries.get(&bench_name) {
230-
if let Some(query) = bench_queries.get(table_id) {
231-
return query.clone();
232-
}
229+
if let Some(bench_queries) = queries.get(&bench_name)
230+
&& let Some(query) = bench_queries.get(table_id)
231+
{
232+
return query.clone();
233233
}
234234

235235
// slow path

‎crates/bindings-macro/src/table.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -679,14 +679,14 @@ pub(crate) fn table_impl(mut args: TableArgs, item: &syn::DeriveInput) -> syn::R
679679
}
680680
}
681681

682-
if let Some(default_value) = &default_value {
683-
if auto_inc.is_some() || primary_key.is_some() || unique.is_some() {
684-
return Err(syn::Error::new(
685-
default_value.span(),
686-
"invalid combination: auto_inc, unique index or primary key cannot have a default value",
687-
));
688-
};
689-
}
682+
if let Some(default_value) = &default_value
683+
&& (auto_inc.is_some() || primary_key.is_some() || unique.is_some())
684+
{
685+
return Err(syn::Error::new(
686+
default_value.span(),
687+
"invalid combination: auto_inc, unique index or primary key cannot have a default value",
688+
));
689+
};
690690

691691
let column = Column {
692692
index: col_num,

‎crates/cli/build.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -467,10 +467,10 @@ fn write_if_changed(path: &Path, contents: &[u8]) -> io::Result<()> {
467467

468468
fn copy_if_changed(src: &Path, dst: &Path) -> io::Result<()> {
469469
let src_bytes = fs::read(src)?;
470-
if let Ok(existing) = fs::read(dst) {
471-
if existing == src_bytes {
472-
return Ok(());
473-
}
470+
if let Ok(existing) = fs::read(dst)
471+
&& existing == src_bytes
472+
{
473+
return Ok(());
474474
}
475475

476476
if let Some(parent) = dst.parent() {

‎crates/cli/src/config.rs‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -220,22 +220,22 @@ impl RawConfig {
220220
ecdsa_public_key: Option<String>,
221221
nickname: Option<String>,
222222
) -> anyhow::Result<()> {
223-
if let Some(nickname) = &nickname {
224-
if let Ok(cfg) = self.find_server(nickname) {
225-
anyhow::bail!(
226-
"Server nickname {} already in use: {}://{}",
227-
nickname,
228-
cfg.protocol,
229-
cfg.host,
230-
);
231-
}
223+
if let Some(nickname) = &nickname
224+
&& let Ok(cfg) = self.find_server(nickname)
225+
{
226+
anyhow::bail!(
227+
"Server nickname {} already in use: {}://{}",
228+
nickname,
229+
cfg.protocol,
230+
cfg.host,
231+
);
232232
}
233233

234234
if let Ok(cfg) = self.find_server(&host) {
235-
if let Some(nick) = &cfg.nickname {
236-
if nick == &host {
237-
anyhow::bail!("Server host name is ambiguous with existing server nickname: {nick}");
238-
}
235+
if let Some(nick) = &cfg.nickname
236+
&& nick == &host
237+
{
238+
anyhow::bail!("Server host name is ambiguous with existing server nickname: {nick}");
239239
}
240240
anyhow::bail!("Server already configured for host: {host}");
241241
}
@@ -295,10 +295,10 @@ impl RawConfig {
295295

296296
// If we're removing the default server,
297297
// unset the default server.
298-
if let Some(default_server) = &self.default_server {
299-
if cfg.nick_or_host_or_url_is(default_server) {
300-
self.default_server = None;
301-
}
298+
if let Some(default_server) = &self.default_server
299+
&& cfg.nick_or_host_or_url_is(default_server)
300+
{
301+
self.default_server = None;
302302
}
303303

304304
return Ok(());
@@ -370,27 +370,27 @@ Fetch the server's fingerprint with:
370370
) -> anyhow::Result<(Option<String>, Option<String>, Option<String>)> {
371371
// Check if the new nickname or host name would introduce ambiguities between
372372
// server configurations.
373-
if let Some(new_nick) = new_nickname {
374-
if let Ok(other_server) = self.find_server(new_nick) {
375-
anyhow::bail!(
376-
"Nickname {} conflicts with saved configuration for server {}: {}://{}",
377-
new_nick,
378-
other_server.nick_or_host(),
379-
other_server.protocol,
380-
other_server.host
381-
);
382-
}
373+
if let Some(new_nick) = new_nickname
374+
&& let Ok(other_server) = self.find_server(new_nick)
375+
{
376+
anyhow::bail!(
377+
"Nickname {} conflicts with saved configuration for server {}: {}://{}",
378+
new_nick,
379+
other_server.nick_or_host(),
380+
other_server.protocol,
381+
other_server.host
382+
);
383383
}
384-
if let Some(new_host) = new_host {
385-
if let Ok(other_server) = self.find_server(new_host) {
386-
anyhow::bail!(
387-
"Host {} conflicts with saved configuration for server {}: {}://{}",
388-
new_host,
389-
other_server.nick_or_host(),
390-
other_server.protocol,
391-
other_server.host
392-
);
393-
}
384+
if let Some(new_host) = new_host
385+
&& let Ok(other_server) = self.find_server(new_host)
386+
{
387+
anyhow::bail!(
388+
"Host {} conflicts with saved configuration for server {}: {}://{}",
389+
new_host,
390+
other_server.nick_or_host(),
391+
other_server.protocol,
392+
other_server.host
393+
);
394394
}
395395

396396
let cfg = self.find_server_mut(server)?;
@@ -418,10 +418,10 @@ Fetch the server's fingerprint with:
418418
if default_server == old_host {
419419
*default_server = new_host.unwrap().to_string();
420420
}
421-
} else if let Some(old_nick) = &old_nickname {
422-
if default_server == old_nick {
423-
*default_server = new_nickname.unwrap().to_string();
424-
}
421+
} else if let Some(old_nick) = &old_nickname
422+
&& default_server == old_nick
423+
{
424+
*default_server = new_nickname.unwrap().to_string();
425425
}
426426
}
427427

‎crates/cli/src/subcommands/dev.rs‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -255,13 +255,13 @@ pub async fn exec(mut config: Config, args: &ArgMatches) -> Result<(), anyhow::E
255255
let (tx, rx) = channel();
256256
let mut watcher: RecommendedWatcher = Watcher::new(
257257
move |res: Result<Event, notify::Error>| {
258-
if let Ok(event) = res {
259-
if matches!(
258+
if let Ok(event) = res
259+
&& matches!(
260260
event.kind,
261261
notify::EventKind::Modify(_) | notify::EventKind::Create(_) | notify::EventKind::Remove(_)
262-
) {
263-
let _ = tx.send(());
264-
}
262+
)
263+
{
264+
let _ = tx.send(());
265265
}
266266
},
267267
notify::Config::default().with_poll_interval(Duration::from_millis(500)),
@@ -670,28 +670,28 @@ fn format_log_record<W: WriteColor>(out: &mut W, record: &LogRecord<'_>) -> Resu
670670
let mut need_space_before_filename = false;
671671
let mut need_colon_sep = false;
672672
let dimmed = ColorSpec::new().set_dimmed(true).clone();
673-
if let Some(function) = &record.function {
674-
if function.as_ref() != SENTINEL {
675-
out.set_color(&dimmed)?;
676-
write!(out, "{function}")?;
677-
out.reset()?;
678-
need_space_before_filename = true;
679-
need_colon_sep = true;
680-
}
673+
if let Some(function) = &record.function
674+
&& function.as_ref() != SENTINEL
675+
{
676+
out.set_color(&dimmed)?;
677+
write!(out, "{function}")?;
678+
out.reset()?;
679+
need_space_before_filename = true;
680+
need_colon_sep = true;
681681
}
682-
if let Some(filename) = &record.filename {
683-
if filename.as_ref() != SENTINEL {
684-
out.set_color(&dimmed)?;
685-
if need_space_before_filename {
686-
write!(out, " ")?;
687-
}
688-
write!(out, "{filename}")?;
689-
if let Some(line) = record.line_number {
690-
write!(out, ":{line}")?;
691-
}
692-
out.reset()?;
693-
need_colon_sep = true;
682+
if let Some(filename) = &record.filename
683+
&& filename.as_ref() != SENTINEL
684+
{
685+
out.set_color(&dimmed)?;
686+
if need_space_before_filename {
687+
write!(out, " ")?;
688+
}
689+
write!(out, "{filename}")?;
690+
if let Some(line) = record.line_number {
691+
write!(out, ":{line}")?;
694692
}
693+
out.reset()?;
694+
need_colon_sep = true;
695695
}
696696
if need_colon_sep {
697697
write!(out, ": ")?;

0 commit comments

Comments
 (0)