From d1e4412ec0bff5b4c46536d619c7960ac25bf1a4 Mon Sep 17 00:00:00 2001 From: Maksim Bondarenkov Date: Tue, 25 Feb 2025 07:28:14 +0300 Subject: [PATCH] chore: update to Rust 1.85.0 --- crates/turborepo-api-client/src/lib.rs | 1 - crates/turborepo-auth/src/auth/sso.rs | 2 +- crates/turborepo-auth/src/lib.rs | 3 +-- crates/turborepo-globwatch/src/lib.rs | 2 +- crates/turborepo-lib/src/query/mod.rs | 2 +- crates/turborepo-lib/src/run/task_id.rs | 2 +- crates/turborepo-lib/src/task_graph/visitor/command.rs | 2 +- crates/turborepo-lib/src/turbo_json/mod.rs | 2 +- crates/turborepo-lockfiles/src/berry/mod.rs | 4 +--- crates/turborepo-repository/src/package_graph/dep_splitter.rs | 2 +- rust-toolchain.toml | 2 +- 11 files changed, 10 insertions(+), 14 deletions(-) diff --git a/crates/turborepo-api-client/src/lib.rs b/crates/turborepo-api-client/src/lib.rs index 4e151946f7c1b..1d3a378b3d325 100644 --- a/crates/turborepo-api-client/src/lib.rs +++ b/crates/turborepo-api-client/src/lib.rs @@ -1,4 +1,3 @@ -#![feature(async_closure)] #![feature(error_generic_member_access)] #![feature(assert_matches)] #![deny(clippy::all)] diff --git a/crates/turborepo-auth/src/auth/sso.rs b/crates/turborepo-auth/src/auth/sso.rs index 3fbd966e779f3..43d8f4496a685 100644 --- a/crates/turborepo-auth/src/auth/sso.rs +++ b/crates/turborepo-auth/src/auth/sso.rs @@ -78,7 +78,7 @@ pub async fn sso_login( api_client, sso_team, Some(valid_token_callback( - "Existing Vercel token for {sso_team} found!", + &format!("Existing Vercel token for {sso_team} found!"), color_config, )), ) diff --git a/crates/turborepo-auth/src/lib.rs b/crates/turborepo-auth/src/lib.rs index d4039e5899a36..c10a9728b372e 100644 --- a/crates/turborepo-auth/src/lib.rs +++ b/crates/turborepo-auth/src/lib.rs @@ -296,8 +296,7 @@ fn is_token_active(metadata: &ResponseTokenMetadata, current_time: u128) -> bool // Not all scopes have an expiration date, so we need to check if all of them // are expired. If there isn't an expiration date, we assume they are infinite // and therefore cannot be expired. - let all_scopes_active = - earliest_expiration.map_or(true, |expiration| current_time < expiration); + let all_scopes_active = earliest_expiration.is_none_or(|expiration| current_time < expiration); all_scopes_active && (active_at <= current_time) } diff --git a/crates/turborepo-globwatch/src/lib.rs b/crates/turborepo-globwatch/src/lib.rs index 3048a8c2bdce6..4d29d234e1b47 100644 --- a/crates/turborepo-globwatch/src/lib.rs +++ b/crates/turborepo-globwatch/src/lib.rs @@ -214,7 +214,7 @@ impl GlobWatcher { // requester. flushes should not be considered as events. for flush_id in e .paths - .extract_if(|p| p.starts_with(flush_dir.as_path())) + .extract_if(.., |p| p.starts_with(flush_dir.as_path())) .filter_map(|p| { get_flush_id( p.strip_prefix(flush_dir.as_path()) diff --git a/crates/turborepo-lib/src/query/mod.rs b/crates/turborepo-lib/src/query/mod.rs index c7e3278ab2efa..c80c9b8dca5f0 100644 --- a/crates/turborepo-lib/src/query/mod.rs +++ b/crates/turborepo-lib/src/query/mod.rs @@ -549,7 +549,7 @@ impl RepositoryQuery { let Ok(package) = package.as_ref() else { return true; }; - filter.as_ref().map_or(true, |f| f.check(&package.package)) + filter.as_ref().is_none_or(|f| f.check(&package.package)) }) .collect::, _>>()?; diff --git a/crates/turborepo-lib/src/run/task_id.rs b/crates/turborepo-lib/src/run/task_id.rs index 331724c296665..c126cf6dccb12 100644 --- a/crates/turborepo-lib/src/run/task_id.rs +++ b/crates/turborepo-lib/src/run/task_id.rs @@ -260,7 +260,7 @@ impl<'a> TaskName<'a> { pub fn in_workspace(&self, workspace: &str) -> bool { self.task_id() - .map_or(true, |task_id| task_id.package() == workspace) + .is_none_or(|task_id| task_id.package() == workspace) } pub fn into_owned(self) -> TaskName<'static> { diff --git a/crates/turborepo-lib/src/task_graph/visitor/command.rs b/crates/turborepo-lib/src/task_graph/visitor/command.rs index ed22a7a5a6abe..97b264cfcfaa2 100644 --- a/crates/turborepo-lib/src/task_graph/visitor/command.rs +++ b/crates/turborepo-lib/src/task_graph/visitor/command.rs @@ -105,7 +105,7 @@ impl<'a> CommandProvider for PackageGraphCommandProvider<'a> { .package_json .scripts .get(task_id.task()) - .map_or(true, |script| script.is_empty()) + .is_none_or(|script| script.is_empty()) { return Ok(None); } diff --git a/crates/turborepo-lib/src/turbo_json/mod.rs b/crates/turborepo-lib/src/turbo_json/mod.rs index 16c0fe8a28f3c..8153cb5754c47 100644 --- a/crates/turborepo-lib/src/turbo_json/mod.rs +++ b/crates/turborepo-lib/src/turbo_json/mod.rs @@ -347,7 +347,7 @@ impl TryFrom for TaskDefinition { fn try_from(raw_task: RawTaskDefinition) -> Result { let outputs = raw_task.outputs.unwrap_or_default().try_into()?; - let cache = raw_task.cache.map_or(true, |c| c.into_inner()); + let cache = raw_task.cache.is_none_or(|c| c.into_inner()); let interactive = raw_task .interactive .as_ref() diff --git a/crates/turborepo-lockfiles/src/berry/mod.rs b/crates/turborepo-lockfiles/src/berry/mod.rs index 0d09e526dfcf1..cc27ebd07dfe6 100644 --- a/crates/turborepo-lockfiles/src/berry/mod.rs +++ b/crates/turborepo-lockfiles/src/berry/mod.rs @@ -440,9 +440,7 @@ impl Lockfile for BerryLockfile { .locator_for_workspace_path(workspace_path) .ok_or_else(|| crate::Error::MissingWorkspace(workspace_path.to_string()))?; - let dependency = self - .resolve_dependency(workspace_locator, name, version) - .map_err(Error::from)?; + let dependency = self.resolve_dependency(workspace_locator, name, version)?; let Some(locator) = self.resolutions.get(&dependency) else { return Ok(None); diff --git a/crates/turborepo-repository/src/package_graph/dep_splitter.rs b/crates/turborepo-repository/src/package_graph/dep_splitter.rs index 5148dff8f56ca..8534e7ac0a96c 100644 --- a/crates/turborepo-repository/src/package_graph/dep_splitter.rs +++ b/crates/turborepo-repository/src/package_graph/dep_splitter.rs @@ -186,7 +186,7 @@ impl<'a> DependencyVersion<'a> { constraint .ok() .zip(version.ok()) - .map_or(true, |(constraint, version)| constraint.satisfies(&version)) + .is_none_or(|(constraint, version)| constraint.satisfies(&version)) } } } diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 9800beb9da529..84c3445fa6e12 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "nightly-2024-11-22" +channel = "nightly-2025-01-03" components = ["rustfmt", "clippy"] profile = "minimal"