fix(turborepo): Adopt std::cell::OnceCell

crates/turborepo-lib/src/commands/link.rs

@@ -460,11 +460,10 @@ fn add_space_id_to_turbo_json(base: &CommandBase, space_id: &str) -> Result<()>
 
 #[cfg(test)]
 mod test {
- use std::fs;
+ use std::{cell::OnceCell, fs};
 
  use anyhow::Result;
  use tempfile::{NamedTempFile, TempDir};
- use tokio::sync::OnceCell;
  use turbopath::AbsoluteSystemPathBuf;
  use turborepo_ui::UI;
  use vercel_api_mock::start_test_server;

crates/turborepo-lib/src/commands/login.rs

@@ -298,12 +298,11 @@ async fn run_sso_one_shot_server(
 
 #[cfg(test)]
 mod test {
- use std::fs;
+ use std::{cell::OnceCell, fs};
 
  use reqwest::Url;
  use serde::Deserialize;
  use tempfile::{tempdir, NamedTempFile};
- use tokio::sync::OnceCell;
  use turbopath::AbsoluteSystemPathBuf;
  use turborepo_ui::UI;
  use vercel_api_mock::start_test_server;

crates/turborepo-lib/src/commands/mod.rs

@@ -1,16 +1,15 @@
-use std::borrow::Borrow;
+use std::{borrow::Borrow, cell::OnceCell};
 
 use anyhow::Result;
 use sha2::{Digest, Sha256};
-use tokio::sync::OnceCell;
 use turbopath::{AbsoluteSystemPath, AbsoluteSystemPathBuf};
 use turborepo_api_client::APIClient;
 use turborepo_ui::UI;
 
 use crate::{
  config::{
  default_user_config_path, get_repo_config_path, ClientConfig, ClientConfigLoader,
- RepoConfig, RepoConfigLoader, UserConfig, UserConfigLoader,
+ Error as ConfigError, RepoConfig, RepoConfigLoader, UserConfig, UserConfigLoader,
  },
  Args,
 };
@@ -55,18 +54,26 @@ impl CommandBase {
  })
  }
 
- fn create_repo_config(&self) -> Result<()> {
+ fn repo_config_init(&self) -> Result<RepoConfig, ConfigError> {
  let repo_config_path = get_repo_config_path(self.repo_root.borrow());
 
- let repo_config = RepoConfigLoader::new(repo_config_path)
+ RepoConfigLoader::new(repo_config_path)
  .with_api(self.args.api.clone())
  .with_login(self.args.login.clone())
  .with_team_slug(self.args.team.clone())
- .load()?;
+ .load()
+ }
 
- self.repo_config.set(repo_config)?;
+ pub fn repo_config(&self) -> Result<&RepoConfig, ConfigError> {
+ self.repo_config.get_or_try_init(|| self.repo_config_init())
+ }
 
- Ok(())
+ pub fn repo_config_mut(&mut self) -> Result<&mut RepoConfig, ConfigError> {
+ // Approximates `get_mut_or_try_init`
+ self.repo_config
+ .get_or_try_init(|| self.repo_config_init())?;
+
+ Ok(self.repo_config.get_mut().unwrap())
  }
 
  // NOTE: This deletes the repo config file. It does *not* remove the
@@ -81,62 +88,41 @@ impl CommandBase {
  Ok(())
  }
 
- fn create_user_config(&self) -> Result<()> {
- let user_config = UserConfigLoader::new(default_user_config_path()?)
+ fn user_config_init(&self) -> Result<UserConfig, ConfigError> {
+ UserConfigLoader::new(default_user_config_path()?)
  .with_token(self.args.token.clone())
- .load()?;
- self.user_config.set(user_config)?;
-
- Ok(())
- }
-
- fn create_client_config(&self) -> Result<()> {
- let client_config = ClientConfigLoader::new()
- .with_remote_cache_timeout(self.args.remote_cache_timeout)
- .load()?;
- self.client_config.set(client_config)?;
-
- Ok(())
+ .load()
  }
 
- pub fn repo_config_mut(&mut self) -> Result<&mut RepoConfig> {
- if self.repo_config.get().is_none() {
- self.create_repo_config()?;
- }
-
- Ok(self.repo_config.get_mut().unwrap())
- }
-
- pub fn repo_config(&self) -> Result<&RepoConfig> {
- if self.repo_config.get().is_none() {
- self.create_repo_config()?;
- }
-
- Ok(self.repo_config.get().unwrap())
+ pub fn user_config(&self) -> Result<&UserConfig, ConfigError> {
+ self.user_config.get_or_try_init(|| self.user_config_init())
  }
 
- pub fn user_config_mut(&mut self) -> Result<&mut UserConfig> {
- if self.user_config.get().is_none() {
-  self.create_user_config()?;
- }
+ pub fn user_config_mut(&mut self) -> Result<&mut UserConfig, ConfigError> {
+ // Approximates `get_mut_or_try_init`
+ self.user_config
+  .get_or_try_init(|| self.user_config_init())?;
 
  Ok(self.user_config.get_mut().unwrap())
  }
 
- pub fn user_config(&self) -> Result<&UserConfig> {
- if self.user_config.get().is_none() {
- self.create_user_config()?;
- }
+ fn client_config_init(&self) -> Result<ClientConfig, ConfigError> {
+ ClientConfigLoader::new()
+ .with_remote_cache_timeout(self.args.remote_cache_timeout)
+ .load()
+ }
 
- Ok(self.user_config.get().unwrap())
+ pub fn client_config(&self) -> Result<&ClientConfig, ConfigError> {
+ self.client_config
+ .get_or_try_init(|| self.client_config_init())
  }
 
- pub fn client_config(&self) -> Result<&ClientConfig> {
- if self.client_config.get().is_none() {
-  self.create_client_config()?;
- }
+ pub fn client_config_mut(&mut self) -> Result<&mut ClientConfig, ConfigError> {
+ // Approximates `get_mut_or_try_init`
+ self.client_config
+  .get_or_try_init(|| self.client_config_init())?;
 
- Ok(self.client_config.get().unwrap())
+ Ok(self.client_config.get_mut().unwrap())
  }
 
  pub fn args(&self) -> &Args {

crates/turborepo-lib/src/config/client.rs

@@ -4,6 +4,8 @@
 use config::{Config, ConfigError, Environment};
 use serde::{Deserialize, Serialize};
 
+use crate::config::Error;
+
 const DEFAULT_TIMEOUT: u64 = 20;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -49,7 +51,7 @@
  self
  }
 
- pub fn load(self) -> Result<ClientConfig> {
+ pub fn load(self) -> Result<ClientConfig, Error> {
  let Self {
  remote_cache_timeout,
  environment,
@@ -60,17 +62,12 @@
  .add_source(Environment::with_prefix("turbo").source(environment))
  .set_override_option("remote_cache_timeout", remote_cache_timeout)?
  .build()?
+ // Deserialize is the only user-input-fallible step.
+ // Everything else is programmer error.
+ // This goes wrong when TURBO_REMOTE_CACHE_TIMEOUT can't be deserialized to u64
  .try_deserialize();
 
- // This goes wrong when TURBO_REMOTE_CACHE_TIMEOUT can't be deserialized to u64
- match config_attempt {
- Err(_) => Ok(ClientConfig {
- config: ClientConfigValue {
- remote_cache_timeout: DEFAULT_TIMEOUT,
- },
- }),
- Ok(config) => Ok(ClientConfig { config }),
- }
+ config_attempt.map(|config| ClientConfig { config })
  }
 }
 

crates/turborepo-lib/src/lib.rs

@@ -3,6 +3,7 @@
 #![feature(error_generic_member_access)]
 #![feature(provide_any)]
 #![feature(option_get_or_insert_default)]
+#![feature(once_cell_try)]
 #![deny(clippy::all)]
 // Clippy's needless mut lint is buggy: https://github.com/rust-lang/rust-clippy/issues/11299
 #![allow(clippy::needless_pass_by_ref_mut)]