Addressing feedback:

- Cleaned up clippy lints
- Removed `nonempty` dependency in favor of `helix-stdx-nonempty.rs`
- Changed Register initialisation signature to take clipboard provider
  rather than configuration struct.

helix-stdx/Cargo.toml

@@ -15,6 +15,7 @@ homepage.workspace = true
 dunce = "1.0"
 etcetera = "0.8"
 ropey = { version = "1.6.1", default-features = false }
+serde = { version = "1.0" }
 which = "6.0"
 regex-cursor = "0.1.4"
 bitflags = "2.4"

helix-stdx/src/lib.rs

@@ -1,4 +1,5 @@
 pub mod env;
 pub mod faccess;
+pub mod nonempty;
 pub mod path;
 pub mod rope;

helix-stdx/src/nonempty.rs

@@ -0,0 +1,59 @@
+use serde::{de::Error, ser::SerializeSeq, Deserialize, Deserializer, Serialize, Serializer};
+
+#[derive(Copy, Clone, Debug, Default, Eq, PartialEq, Hash)]
+pub struct EmptyError;
+
+#[derive(Clone, PartialEq, Eq, Debug)]
+pub struct NonEmptyVec<T>
+where
+    T: Clone,
+{
+    head: T,
+    tail: Vec<T>,
+}
+
+impl<T: Clone> NonEmptyVec<T> {
+    pub fn head(&self) -> &T {
+        &self.head
+    }
+
+    pub fn tail(&self) -> &Vec<T> {
+        &self.tail
+    }
+
+    pub fn from_vec(mut vec: Vec<T>) -> Option<Self> {
+        if vec.is_empty() {
+            None
+        } else {
+            let head = vec.remove(0);
+            Some(Self { head, tail: vec })
+        }
+    }
+}
+
+impl<T: Serialize + Clone> Serialize for NonEmptyVec<T> {
+    fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        let mut seq = serializer.serialize_seq(Some(self.tail.len() + 1))?;
+        seq.serialize_element(&self.head)?;
+        for e in &self.tail {
+            seq.serialize_element(&e)?;
+        }
+        seq.end()
+    }
+}
+
+impl<'de, T: Deserialize<'de> + Clone> Deserialize<'de> for NonEmptyVec<T> {
+    fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        let v = <Vec<T>>::deserialize(deserializer)?;
+        let mut v = v.into_iter();
+
+        if let Some(first) = v.next() {
+            Ok(NonEmptyVec {
+                head: first,
+                tail: v.collect(),
+            })
+        } else {
+            Err(D::Error::custom("vector must be non-empty"))
+        }
+    }
+}

helix-term/src/health.rs

@@ -106,7 +106,7 @@ pub fn clipboard() -> std::io::Result<()> {
         }
         Err(err) => {
             writeln!(stdout, "{}", "Configuration file malformed".red())?;
-            writeln!(stdout, "{}", err.to_string())?;
+            writeln!(stdout, "{}", err)?;
             return Ok(());
         }
     };

helix-view/Cargo.toml

@@ -50,8 +50,6 @@ toml = "0.8"
 log = "~0.4"
 
 parking_lot = "0.12.2"
-nonempty = { version = "0.10.0", features = ["serde", "serialize"] }
-
 
 [target.'cfg(windows)'.dependencies]
 clipboard-win = { version = "5.3", features = ["std"] }

helix-view/src/clipboard.rs

@@ -1,7 +1,7 @@
 // Implementation reference: https://github.com/neovim/neovim/blob/f2906a4669a2eef6d7bf86a29648793d63c98949/runtime/autoload/provider/clipboard.vim#L68-L152
 
 use anyhow::Result;
-use nonempty::NonEmpty;
+use helix_stdx::nonempty::NonEmptyVec;
 use serde::{Deserialize, Serialize};
 use std::borrow::Cow;
 
@@ -20,7 +20,7 @@ pub trait ClipboardProvider: std::fmt::Debug {
 impl dyn ClipboardProvider {
     pub fn from_string(string: &str) -> Result<Box<dyn ClipboardProvider>> {
         let config: ClipboardConfig = serde_json::from_str(string)?;
-        return Ok(config.get_provider());
+        Ok(config.get_provider())
     }
 }
 
@@ -222,51 +222,42 @@ impl ClipboardConfig {
             ClipboardConfig::Custom(cust) => Box::new(command_provider::command::Provider {
                 name: "Custom configuration".to_string(),
                 get_cmd: command_provider::command::CommandConfig {
-                    prg: cust.paste.head.clone(),
-                    args: cust.paste.tail.clone(),
+                    prg: cust.paste.head().clone(),
+                    args: cust.paste.tail().clone(),
                 },
                 set_cmd: command_provider::command::CommandConfig {
-                    prg: cust.copy.head.clone(),
-                    args: cust.copy.tail.clone(),
+                    prg: cust.copy.head().clone(),
+                    args: cust.copy.tail().clone(),
                 },
                 get_primary_cmd: Some(command_provider::command::CommandConfig {
-                    prg: cust.copy.head.clone(),
-                    args: cust.copy.tail.clone(),
+                    prg: cust.copy.head().clone(),
+                    args: cust.copy.tail().clone(),
                 }),
                 set_primary_cmd: Some(command_provider::command::CommandConfig {
-                    prg: cust.copy.head.clone(),
-                    args: cust.copy.tail.clone(),
+                    prg: cust.copy.head().clone(),
+                    args: cust.copy.tail().clone(),
                 }),
             }),
-            ClipboardConfig::None => Box::new(NoneProvider::new()),
+            ClipboardConfig::None => Box::<NoneProvider>::default(),
         }
     }
 }
 
 #[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct CustomClipboardConfig {
-    copy: NonEmpty<String>,
-    paste: NonEmpty<String>,
-    primary_copy: Option<NonEmpty<String>>,
-    primary_paste: Option<NonEmpty<String>>,
+    copy: NonEmptyVec<String>,
+    paste: NonEmptyVec<String>,
+    primary_copy: Option<NonEmptyVec<String>>,
+    primary_paste: Option<NonEmptyVec<String>>,
 }
 
-#[derive(Debug)]
+#[derive(Debug, Default)]
 pub struct NoneProvider {
     buf: String,
     primary_buf: String,
 }
 
-impl NoneProvider {
-    pub fn new() -> Self {
-        Self {
-            buf: String::new(),
-            primary_buf: String::new(),
-        }
-    }
-}
-
 impl ClipboardProvider for NoneProvider {
     fn name(&self) -> std::borrow::Cow<'_, str> {
         std::borrow::Cow::Borrowed("None (internal to helix)")

helix-view/src/editor.rs

@@ -1118,7 +1118,7 @@ impl Editor {
             theme_loader,
             last_theme: None,
             last_selection: None,
-            registers: Registers::new(config.clone()),
+            registers: Registers::new(conf.clipboard_provider.get_provider()),
             status_msg: None,
             autoinfo: None,
             idle_timer: Box::pin(sleep(conf.idle_timeout)),

helix-view/src/register.rs

@@ -1,13 +1,11 @@
-use std::{borrow::Cow, collections::HashMap, iter, sync::Arc};
+use std::{borrow::Cow, collections::HashMap, iter};
 
 use anyhow::Result;
-use arc_swap::access::DynAccess;
 use helix_core::NATIVE_LINE_ENDING;
 
 use crate::{
     clipboard::{ClipboardProvider, ClipboardType},
     document::SCRATCH_BUFFER_NAME,
-    editor::Config,
     Editor,
 };
 
@@ -35,10 +33,10 @@ pub struct Registers {
 }
 
 impl Registers {
-    pub fn new(config: Arc<dyn DynAccess<Config>>) -> Self {
+    pub fn new(clipboard_provider: Box<dyn ClipboardProvider>) -> Self {
         Self {
             inner: Default::default(),
-            clipboard_provider: config.load().clipboard_provider.get_provider(),
+            clipboard_provider,
             last_search_register: '/',
         }
     }