Derive debug without feature

Note that this also removed those `finish_non_exhaustive()`.

helix-core/Cargo.toml

@@ -10,7 +10,6 @@ license = "MPL-2.0"
 
 [features]
 embed_runtime = ["rust-embed"]
-debug = []
 
 [dependencies]
 helix-syntax = { path = "../helix-syntax" }

helix-core/src/diagnostic.rs

@@ -1,5 +1,4 @@
-#[cfg_attr(feature = "debug", derive(Debug))]
-#[derive(Eq, PartialEq)]
+#[derive(Debug, Eq, PartialEq)]
 pub enum Severity {
     Error,
     Warning,
@@ -7,13 +6,13 @@ pub enum Severity {
     Hint,
 }
 
-#[cfg_attr(feature = "debug", derive(Debug))]
+#[derive(Debug)]
 pub struct Range {
     pub start: usize,
     pub end: usize,
 }
 
-#[cfg_attr(feature = "debug", derive(Debug))]
+#[derive(Debug)]
 pub struct Diagnostic {
     pub range: Range,
     pub line: usize,

helix-core/src/graphemes.rs

@@ -147,8 +147,7 @@ pub fn is_grapheme_boundary(slice: RopeSlice, char_idx: usize) -> bool {
 }
 
 /// An iterator over the graphemes of a `RopeSlice`.
-#[cfg_attr(feature = "debug", derive(Debug))]
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct RopeGraphemes<'a> {
     text: RopeSlice<'a>,
     chunks: Chunks<'a>,

helix-core/src/history.rs

@@ -2,7 +2,7 @@
 use smallvec::{smallvec, SmallVec};
 
 /// Undo-tree style history store.
-#[cfg_attr(feature = "debug", derive(Debug))]
+#[derive(Debug)]
 pub struct History {
     revisions: Vec<Revision>,
     cursor: usize,

helix-core/src/movement.rs

@@ -1,8 +1,7 @@
 use crate::graphemes::{nth_next_grapheme_boundary, nth_prev_grapheme_boundary, RopeGraphemes};
 use crate::{coords_at_pos, pos_at_coords, ChangeSet, Position, Range, Rope, RopeSlice, Selection};
 
-#[cfg_attr(feature = "debug", derive(Debug))]
-#[derive(Copy, Clone, PartialEq, Eq)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub enum Direction {
     Forward,
     Backward,

helix-core/src/state.rs

@@ -1,8 +1,7 @@
 use crate::{Rope, Selection};
 
 /// A state represents the current editor state of a single buffer.
-#[cfg_attr(feature = "debug", derive(Debug))]
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct State {
     pub doc: Rope,
     pub selection: Selection,

helix-core/src/syntax.rs

@@ -1,12 +1,11 @@
 use crate::{regex::Regex, Change, Rope, RopeSlice, Transaction};
 pub use helix_syntax::{get_language, get_language_name, Lang};
 
-#[cfg(feature = "debug")]
-use std::fmt;
 use std::{
     borrow::Cow,
     cell::RefCell,
     collections::{HashMap, HashSet},
+    fmt,
     path::{Path, PathBuf},
     sync::Arc,
 };
@@ -14,15 +13,13 @@
 use once_cell::sync::{Lazy, OnceCell};
 use serde::{Deserialize, Serialize};
 
-#[cfg_attr(feature = "debug", derive(Debug))]
-#[derive(Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize)]
 pub struct Configuration {
     pub language: Vec<LanguageConfiguration>,
 }
 
 // largely based on tree-sitter/cli/src/loader.rs
-#[cfg_attr(feature = "debug", derive(Debug))]
-#[derive(Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct LanguageConfiguration {
     #[serde(rename = "name")]
@@ -50,8 +47,7 @@ pub struct LanguageConfiguration {
     pub(crate) indent_query: OnceCell<Option<IndentQuery>>,
 }
 
-#[cfg_attr(feature = "debug", derive(Debug))]
-#[derive(Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct LanguageServerConfiguration {
     pub command: String,
@@ -60,16 +56,14 @@ pub struct LanguageServerConfiguration {
     pub args: Vec<String>,
 }
 
-#[cfg_attr(feature = "debug", derive(Debug))]
-#[derive(Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct IndentationConfiguration {
     pub tab_width: usize,
     pub unit: String,
 }
 
-#[cfg_attr(feature = "debug", derive(Debug))]
-#[derive(Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct IndentQuery {
     #[serde(default)]
@@ -196,7 +190,7 @@ pub fn scope(&self) -> &str {
 
 pub static LOADER: OnceCell<Loader> = OnceCell::new();
 
-#[cfg_attr(feature = "debug", derive(Debug))]
+#[derive(Debug)]
 pub struct Loader {
     // highlight_names ?
     language_configs: Vec<Arc<LanguageConfiguration>>,
@@ -264,10 +258,9 @@ pub struct TsParser {
     cursors: Vec<QueryCursor>,
 }
 
-#[cfg(feature = "debug")]
 impl fmt::Debug for TsParser {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("TsParser").finish_non_exhaustive()
+        f.debug_struct("TsParser").finish()
     }
 }
 
@@ -279,7 +272,7 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
     })
 }
 
-#[cfg_attr(feature = "debug", derive(Debug))]
+#[derive(Debug)]
 pub struct Syntax {
     config: Arc<HighlightConfiguration>,
 
@@ -460,7 +453,7 @@ pub fn highlight_iter<'a>(
     // buffer_range_for_scope_at_pos
 }
 
-#[cfg_attr(feature = "debug", derive(Debug))]
+#[derive(Debug)]
 pub struct LanguageLayer {
     // mode
     // grammar
@@ -769,7 +762,7 @@ pub enum HighlightEvent {
 /// Contains the data neeeded to higlight code written in a particular language.
 ///
 /// This struct is immutable and can be shared between threads.
-#[cfg_attr(feature = "debug", derive(Debug))]
+#[derive(Debug)]
 pub struct HighlightConfiguration {
     pub language: Grammar,
     pub query: Query,
@@ -800,7 +793,7 @@ struct LocalScope<'a> {
     local_defs: Vec<LocalDef<'a>>,
 }
 
-#[cfg_attr(feature = "debug", derive(Debug))]
+#[derive(Debug)]
 struct HighlightIter<'a, 'tree: 'a, F>
 where
     F: FnMut(&str) -> Option<&'a HighlightConfiguration> + 'a,
@@ -826,10 +819,9 @@ struct HighlightIterLayer<'a, 'tree: 'a> {
     depth: usize,
 }
 
-#[cfg(feature = "debug")]
 impl<'a, 'tree: 'a> fmt::Debug for HighlightIterLayer<'a, 'tree> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("HighlightIterLayer").finish_non_exhaustive()
+        f.debug_struct("HighlightIterLayer").finish()
     }
 }
 

helix-core/src/transaction.rs

@@ -15,8 +15,7 @@ pub enum Operation {
     Insert(Tendril),
 }
 
-#[cfg_attr(feature = "debug", derive(Debug))]
-#[derive(Copy, Clone, PartialEq, Eq)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub enum Assoc {
     Before,
     After,

helix-lsp/Cargo.toml

@@ -7,9 +7,6 @@ license = "MPL-2.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-[features]
-debug = ["helix-core/debug"]
-
 [dependencies]
 helix-core = { path = "../helix-core" }
 

helix-lsp/src/client.rs

@@ -16,7 +16,7 @@
     sync::mpsc::{channel, UnboundedReceiver, UnboundedSender},
 };
 
-#[cfg_attr(feature = "debug", derive(Debug))]
+#[derive(Debug)]
 pub struct Client {
     _process: Child,
     server_tx: UnboundedSender<Payload>,

helix-lsp/src/lib.rs

@@ -172,7 +172,7 @@ pub fn parse(method: &str, params: jsonrpc::Params) -> Option<Notification> {
     }
 }
 
-#[cfg_attr(feature = "debug", derive(Debug))]
+#[derive(Debug)]
 pub struct Registry {
     inner: HashMap<LanguageId, Arc<Client>>,
 

helix-lsp/src/transport.rs

@@ -31,7 +31,7 @@ enum ServerMessage {
     Call(jsonrpc::Call),
 }
 
-#[cfg_attr(feature = "debug", derive(Debug))]
+#[derive(Debug)]
 pub struct Transport {
     client_tx: UnboundedSender<jsonrpc::Call>,
     client_rx: UnboundedReceiver<Payload>,

helix-term/Cargo.toml

@@ -10,7 +10,6 @@ license = "MPL-2.0"
 
 [features]
 embed_runtime = ["helix-core/embed_runtime"]
-debug = ["helix-core/debug", "helix-view/debug"]
 
 [[bin]]
 name = "hx"

helix-tui/Cargo.toml

@@ -10,7 +10,6 @@ license = "MPL-2.0"
 
 [features]
 default = ["crossterm"]
-debug = []
 
 [dependencies]
 bitflags = "1.0"

helix-view/Cargo.toml

@@ -10,7 +10,6 @@ license = "MPL-2.0"
 [features]
 term = ["tui", "crossterm"]
 default = ["term"]
-debug = ["helix-core/debug", "helix-lsp/debug"]
 
 [dependencies]
 anyhow = "1"

helix-view/src/document.rs

@@ -13,8 +13,7 @@
 
 use std::collections::HashMap;
 
-#[cfg_attr(feature = "debug", derive(Debug))]
-#[derive(Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub enum Mode {
     Normal,
     Select,
@@ -53,9 +52,7 @@ pub struct Document {
     language_server: Option<Arc<helix_lsp::Client>>,
 }
 
-#[cfg(feature = "debug")]
 use std::fmt;
-#[cfg(feature = "debug")]
 impl fmt::Debug for Document {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("Document")
@@ -74,7 +71,7 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
             .field("version", &self.version)
             .field("diagnostics", &self.diagnostics)
             // .field("language_server", &self.language_server)
-            .finish_non_exhaustive()
+            .finish()
     }
 }
 

helix-view/src/editor.rs

@@ -9,7 +9,7 @@
 
 pub use helix_core::diagnostic::Severity;
 
-#[cfg_attr(feature = "debug", derive(Debug))]
+#[derive(Debug)]
 pub struct Editor {
     pub tree: Tree,
     pub documents: SlotMap<DocumentId, Document>,
@@ -21,8 +21,7 @@ pub struct Editor {
     pub status_msg: Option<(String, Severity)>,
 }
 
-#[cfg_attr(feature = "debug", derive(Debug))]
-#[derive(Copy, Clone)]
+#[derive(Debug, Copy, Clone)]
 pub enum Action {
     Replace,
     HorizontalSplit,

helix-view/src/tree.rs

@@ -4,7 +4,7 @@
 
 // the dimensions are recomputed on windo resize/tree change.
 //
-#[cfg_attr(feature = "debug", derive(Debug))]
+#[derive(Debug)]
 pub struct Tree {
     root: ViewId,
     // (container, index inside the container)
@@ -18,13 +18,13 @@ pub struct Tree {
     stack: Vec<(ViewId, Rect)>,
 }
 
-#[cfg_attr(feature = "debug", derive(Debug))]
+#[derive(Debug)]
 pub struct Node {
     parent: ViewId,
     content: Content,
 }
 
-#[cfg_attr(feature = "debug", derive(Debug))]
+#[derive(Debug)]
 pub enum Content {
     View(Box<View>),
     Container(Box<Container>),
@@ -48,15 +48,14 @@ pub fn view(view: View) -> Self {
 
 // TODO: screen coord to container + container coordinate helpers
 
-#[cfg_attr(feature = "debug", derive(Debug))]
-#[derive(PartialEq, Eq)]
+#[derive(Debug, PartialEq, Eq)]
 pub enum Layout {
     Horizontal,
     Vertical,
     // could explore stacked/tabbed
 }
 
-#[cfg_attr(feature = "debug", derive(Debug))]
+#[derive(Debug)]
 pub struct Container {
     layout: Layout,
     children: Vec<ViewId>,
@@ -437,7 +436,7 @@ pub fn focus_next(&mut self) {
     }
 }
 
-#[cfg_attr(feature = "debug", derive(Debug))]
+#[derive(Debug)]
 pub struct Traverse<'a> {
     tree: &'a Tree,
     stack: Vec<ViewId>, // TODO: reuse the one we use on update

helix-view/src/view.rs

@@ -12,7 +12,7 @@
 
 type Jump = (DocumentId, Selection);
 
-#[cfg_attr(feature = "debug", derive(Debug))]
+#[derive(Debug)]
 pub struct JumpList {
     jumps: Vec<Jump>,
     current: usize,
@@ -59,7 +59,7 @@ pub fn backward(&mut self, view_id: ViewId, doc: &mut Document, count: usize) ->
     }
 }
 
-#[cfg_attr(feature = "debug", derive(Debug))]
+#[derive(Debug)]
 pub struct View {
     pub id: ViewId,
     pub doc: DocumentId,