feat(rename): renamed eww && eww_shared_util to be ewwii

Cargo.lock

@@ -1000,16 +1000,6 @@ dependencies = [
  "pin-project-lite",
 ]
 
-[[package]]
-name = "eww_shared_util"
-version = "0.1.0"
-dependencies = [
- "chrono",
- "derive_more",
- "ref-cast",
- "serde",
-]
-
 [[package]]
 name = "ewwii"
 version = "0.1.0"
@@ -1021,7 +1011,7 @@ dependencies = [
  "clap_complete",
  "codespan-reporting",
  "derive_more",
- "eww_shared_util",
+ "ewwii_shared_util",
  "extend",
  "futures",
  "gdk-sys",
@@ -1055,6 +1045,16 @@ dependencies = [
  "zbus",
 ]
 
+[[package]]
+name = "ewwii_shared_util"
+version = "0.1.0"
+dependencies = [
+ "chrono",
+ "derive_more",
+ "ref-cast",
+ "serde",
+]
+
 [[package]]
 name = "extend"
 version = "1.2.0"
@@ -2771,7 +2771,7 @@ dependencies = [
  "cached",
  "chrono",
  "chrono-tz",
- "eww_shared_util",
+ "ewwii_shared_util",
  "insta",
  "itertools",
  "jaq-core",
@@ -3623,7 +3623,7 @@ dependencies = [
  "anyhow",
  "codespan-reporting",
  "derive_more",
- "eww_shared_util",
+ "ewwii_shared_util",
  "insta",
  "itertools",
  "lalrpop",

Cargo.toml

@@ -5,7 +5,7 @@ resolver = "2"
 [workspace.dependencies]
 
 simplexpr = { version = "0.1.0", path = "crates/simplexpr" }
-eww_shared_util = { version = "0.1.0", path = "crates/eww_shared_util" }
+ewwii_shared_util = { version = "0.1.0", path = "crates/ewwii_shared_util" }
 yuck = { version = "0.1.0", path = "crates/yuck", default-features = false }
 iirhai = { version = "0.1.0", path = "crates/iirhai" }
 notifier_host = { version = "0.1.0", path = "crates/notifier_host" }

copy/eww/Cargo.toml

@@ -16,7 +16,7 @@ wayland = ["gtk-layer-shell"]
 
 [dependencies]
 simplexpr.workspace = true
-eww_shared_util.workspace = true
+ewwii_shared_util.workspace = true
 yuck.workspace = true
 notifier_host.workspace = true
 

copy/eww/src/app.rs

@@ -15,7 +15,7 @@ use crate::{
 };
 use anyhow::anyhow;
 use codespan_reporting::files::Files;
-use eww_shared_util::{Span, VarName};
+use ewwii_shared_util::{Span, VarName};
 use gdk::Monitor;
 use glib::ObjectExt;
 use gtk::{gdk, glib};

copy/eww/src/config/eww_config.rs

@@ -1,7 +1,7 @@
 // TODO: Yuck found, have to replace with lua
 
 use anyhow::{bail, Context, Result};
-use eww_shared_util::VarName;
+use ewwii_shared_util::VarName;
 use std::collections::HashMap;
 use yuck::{
     config::{

copy/eww/src/config/inbuilt.rs

@@ -9,7 +9,7 @@ use yuck::config::{
 };
 
 use crate::{config::system_stats::*, paths::EwwPaths};
-use eww_shared_util::VarName;
+use ewwii_shared_util::VarName;
 
 macro_rules! define_builtin_vars {
     ($($name:literal [$interval:literal] => $fun:expr),*$(,)?) => {
@@ -23,7 +23,7 @@ macro_rules! define_builtin_vars {
                     command: VarSource::Function($fun),
                     initial_value: None,
                     interval: std::time::Duration::from_secs($interval),
-                    name_span: eww_shared_util::span::Span::DUMMY,
+                    name_span: ewwii_shared_util::span::Span::DUMMY,
                 })
                 ),*
             }
@@ -76,7 +76,7 @@ macro_rules! define_magic_constants {
                 $(VarName::from($name) => VarDefinition {
                     name: VarName::from($name),
                     initial_value: $value,
-                    span: eww_shared_util::span::Span::DUMMY
+                    span: ewwii_shared_util::span::Span::DUMMY
                 }),*
             }
         }

copy/eww/src/config/script_var.rs

@@ -4,7 +4,7 @@ use std::process::Command;
 
 use anyhow::{anyhow, bail, Context, Result};
 use codespan_reporting::diagnostic::Severity;
-use eww_shared_util::{Span, VarName};
+use ewwii_shared_util::{Span, VarName};
 use simplexpr::dynval::DynVal;
 use yuck::{
     config::script_var_definition::{ScriptVarDefinition, VarSource},

copy/eww/src/error_handling_ctx.rs

@@ -10,7 +10,7 @@ use codespan_reporting::{
     diagnostic::Diagnostic,
     term::{self, Chars},
 };
-use eww_shared_util::Span;
+use ewwii_shared_util::Span;
 use once_cell::sync::Lazy;
 use simplexpr::{dynval::ConversionError, eval::EvalError};
 use yuck::{config::validate::ValidationError, error::DiagError, format_diagnostic::ToDiagnostic};

copy/eww/src/file_database.rs

@@ -3,7 +3,7 @@
 use std::collections::HashMap;
 
 use codespan_reporting::files::Files;
-use eww_shared_util::Span;
+use ewwii_shared_util::Span;
 use yuck::{
     config::file_provider::{FilesError, YuckFileProvider},
     error::DiagError,

copy/eww/src/opts.rs

@@ -2,7 +2,7 @@
 
 use anyhow::{Context, Result};
 use clap::{Parser, Subcommand};
-use eww_shared_util::VarName;
+use ewwii_shared_util::VarName;
 use serde::{Deserialize, Serialize};
 use simplexpr::dynval::DynVal;
 use yuck::{

copy/eww/src/script_var_handler.rs

@@ -7,7 +7,7 @@ use crate::{
 use anyhow::{anyhow, Result};
 use app::DaemonCommand;
 
-use eww_shared_util::VarName;
+use ewwii_shared_util::VarName;
 use nix::{
     sys::signal,
     unistd::{setpgid, Pid},

copy/eww/src/state/scope.rs

@@ -1,7 +1,7 @@
 use anyhow::Result;
 use std::{collections::HashMap, rc::Rc};
 
-use eww_shared_util::VarName;
+use ewwii_shared_util::VarName;
 use simplexpr::dynval::DynVal;
 
 use super::scope_graph::{ScopeGraph, ScopeIndex};

copy/eww/src/state/scope_graph.rs

@@ -4,7 +4,7 @@ use std::{
 };
 
 use anyhow::{anyhow, bail, Context, Result};
-use eww_shared_util::{AttrName, VarName};
+use ewwii_shared_util::{AttrName, VarName};
 use simplexpr::{dynval::DynVal, SimplExpr};
 use tokio::sync::mpsc::UnboundedSender;
 

copy/eww/src/state/test.rs

@@ -4,7 +4,7 @@ use std::sync::{
     Arc,
 };
 
-use eww_shared_util::{Span, VarName};
+use ewwii_shared_util::{Span, VarName};
 use maplit::hashmap;
 use simplexpr::{dynval::DynVal, SimplExpr};
 

copy/eww/src/widgets/build_widget.rs

@@ -1,6 +1,6 @@
 use anyhow::{Context, Result};
 use codespan_reporting::diagnostic::Severity;
-use eww_shared_util::{AttrName, Spanned};
+use ewwii_shared_util::{AttrName, Spanned};
 use gtk::{
     gdk::prelude::Cast,
     prelude::{BoxExt, ContainerExt, WidgetExt},

copy/eww/src/widgets/def_widget_macro.rs

@@ -10,7 +10,7 @@ macro_rules! def_widget {
         $({
             $(
                 // explicitly box the function to not cause tons of monomorphization related duplications of Vec::retain
-                let retain_fn: Box<dyn Fn(&eww_shared_util::wrappers::AttrName, &mut yuck::config::attributes::AttrEntry) -> bool> =
+                let retain_fn: Box<dyn Fn(&ewwii_shared_util::wrappers::AttrName, &mut yuck::config::attributes::AttrEntry) -> bool> =
                     Box::new(|a, _| &a.0 != &::std::stringify!($attr_name).replace('_', "-"));
                 $args.unhandled_attrs.retain(retain_fn);
             )*
@@ -19,10 +19,10 @@ macro_rules! def_widget {
             // If an attribute is explicitly marked as optional (? appended to type)
             // the attribute will still show up here, as a `None` value. Otherwise, all values in this map
             // will be `Some`.
-            let attr_map: Result<HashMap<eww_shared_util::AttrName, Option<simplexpr::SimplExpr>>> = (|| {
+            let attr_map: Result<HashMap<ewwii_shared_util::AttrName, Option<simplexpr::SimplExpr>>> = (|| {
                 Ok(::maplit::hashmap! {
                     $(
-                        eww_shared_util::AttrName(::std::stringify!($attr_name).to_owned()) =>
+                        ewwii_shared_util::AttrName(::std::stringify!($attr_name).to_owned()) =>
                             def_widget!(@get_value $args, &::std::stringify!($attr_name).replace('_', "-"), $(? $($optional)?)? $(= $default)?)
                     ),*
                 })
@@ -33,7 +33,7 @@ macro_rules! def_widget {
                 if attr_map.values().any(|x| x.is_some()) {
 
                     // Get all the variables that are referred to in any of the attributes expressions
-                    let required_vars: Vec<eww_shared_util::VarName> = attr_map
+                    let required_vars: Vec<ewwii_shared_util::VarName> = attr_map
                         .values()
                         .flat_map(|expr| expr.as_ref().map(|x| x.collect_var_refs()).unwrap_or_default())
                         .collect();

copy/eww/src/widgets/widget_definitions.rs

@@ -7,7 +7,7 @@ use crate::{
 };
 use anyhow::{anyhow, Context, Result};
 use codespan_reporting::diagnostic::Severity;
-use eww_shared_util::Spanned;
+use ewwii_shared_util::Spanned;
 
 use gdk::{ModifierType, NotifyType};
 use glib::translate::FromGlib;

copy/eww/src/window_arguments.rs

@@ -1,5 +1,5 @@
 use anyhow::{bail, Context, Result};
-use eww_shared_util::VarName;
+use ewwii_shared_util::VarName;
 use simplexpr::dynval::DynVal;
 use std::{
     collections::{HashMap, HashSet},

copy/eww/src/window_initiator.rs

@@ -1,5 +1,5 @@
 use anyhow::Result;
-use eww_shared_util::{AttrName, VarName};
+use ewwii_shared_util::{AttrName, VarName};
 use simplexpr::dynval::DynVal;
 use std::collections::HashMap;
 // TODO: Yuck found, have to replace with lua

crates/ewwii/Cargo.toml

@@ -16,7 +16,7 @@ wayland = ["gtk-layer-shell"]
 
 [dependencies]
 simplexpr.workspace = true
-eww_shared_util.workspace = true
+ewwii_shared_util.workspace = true
 yuck.workspace = true
 iirhai.workspace = true
 notifier_host.workspace = true

crates/ewwii/src/app.rs

@@ -14,7 +14,7 @@ use crate::{
 };
 use anyhow::anyhow;
 use codespan_reporting::files::Files;
-use eww_shared_util::{Span, VarName};
+use ewwii_shared_util::{Span, VarName};
 use gdk::Monitor;
 use glib::ObjectExt;
 use gtk::{gdk, glib};

crates/ewwii/src/config/ewwii_config.rs

@@ -2,7 +2,7 @@
 // I am losing my sanity replacing it!
 // I wonder how honorificabilitudinitatibus will I feel after replacing yuck...
 use anyhow::{bail, Result};
-use eww_shared_util::VarName;
+use ewwii_shared_util::VarName;
 use std::{
     collections::HashMap,
     path::PathBuf,
@@ -17,7 +17,7 @@ use crate::{
 
 use iirhai::{
     parser::ParseConfig,
-}
+};
 
 use tokio::{
     runtime::Runtime,
@@ -72,10 +72,10 @@ impl EwwConfig {
                 let mut window_definitions = HashMap::new();
 
                 for node in config_tree {
-                    if let WidgetNode::DefWindow { name, props, _ } = node {
+                    if let WidgetNode::DefWindow { name, props, .. } = node {
                         let def = WindowDefinition {
-                            name.clone(),
-                            props.clone(),
+                            name: name.clone(),
+                            props: props.clone(),
                         };
                         window_definitions.insert(name.clone(), def);
                     }

crates/ewwii/src/error_handling_ctx.rs

@@ -10,7 +10,7 @@ use codespan_reporting::{
     diagnostic::Diagnostic,
     term::{self, Chars},
 };
-use eww_shared_util::Span;
+use ewwii_shared_util::Span;
 use once_cell::sync::Lazy;
 use simplexpr::{dynval::ConversionError, eval::EvalError};
 use yuck::{config::validate::ValidationError, error::DiagError, format_diagnostic::ToDiagnostic};

crates/ewwii/src/file_database.rs

@@ -3,7 +3,7 @@
 use std::collections::HashMap;
 
 use codespan_reporting::files::Files;
-use eww_shared_util::Span;
+use ewwii_shared_util::Span;
 use yuck::{
     config::file_provider::{FilesError, YuckFileProvider},
     error::DiagError,

crates/ewwii/src/opts.rs

@@ -2,7 +2,7 @@
 
 use anyhow::{Context, Result};
 use clap::{Parser, Subcommand};
-use eww_shared_util::VarName;
+use ewwii_shared_util::VarName;
 use serde::{Deserialize, Serialize};
 use simplexpr::dynval::DynVal;
 use yuck::{

crates/ewwii/src/state/scope.rs

@@ -1,7 +1,7 @@
 use anyhow::Result;
 use std::{collections::HashMap, rc::Rc};
 
-use eww_shared_util::VarName;
+use ewwii_shared_util::VarName;
 use simplexpr::dynval::DynVal;
 
 use super::scope_graph::{ScopeGraph, ScopeIndex};

crates/ewwii/src/state/scope_graph.rs

@@ -4,7 +4,7 @@ use std::{
 };
 
 use anyhow::{anyhow, bail, Context, Result};
-use eww_shared_util::{AttrName, VarName};
+use ewwii_shared_util::{AttrName, VarName};
 use simplexpr::{dynval::DynVal, SimplExpr};
 use tokio::sync::mpsc::UnboundedSender;
 

crates/ewwii/src/state/test.rs

@@ -4,7 +4,7 @@ use std::sync::{
     Arc,
 };
 
-use eww_shared_util::{Span, VarName};
+use ewwii_shared_util::{Span, VarName};
 use maplit::hashmap;
 use simplexpr::{dynval::DynVal, SimplExpr};
 

crates/ewwii/src/widgets/build_widget.rs

@@ -1,6 +1,6 @@
 use anyhow::{Context, Result};
 use codespan_reporting::diagnostic::Severity;
-use eww_shared_util::{AttrName, Spanned};
+use ewwii_shared_util::{AttrName, Spanned};
 use gtk::{
     gdk::prelude::Cast,
     prelude::{BoxExt, ContainerExt, WidgetExt},

crates/ewwii/src/widgets/def_widget_macro.rs

@@ -10,7 +10,7 @@ macro_rules! def_widget {
         $({
             $(
                 // explicitly box the function to not cause tons of monomorphization related duplications of Vec::retain
-                let retain_fn: Box<dyn Fn(&eww_shared_util::wrappers::AttrName, &mut yuck::config::attributes::AttrEntry) -> bool> =
+                let retain_fn: Box<dyn Fn(&ewwii_shared_util::wrappers::AttrName, &mut yuck::config::attributes::AttrEntry) -> bool> =
                     Box::new(|a, _| &a.0 != &::std::stringify!($attr_name).replace('_', "-"));
                 $args.unhandled_attrs.retain(retain_fn);
             )*
@@ -19,10 +19,10 @@ macro_rules! def_widget {
             // If an attribute is explicitly marked as optional (? appended to type)
             // the attribute will still show up here, as a `None` value. Otherwise, all values in this map
             // will be `Some`.
-            let attr_map: Result<HashMap<eww_shared_util::AttrName, Option<simplexpr::SimplExpr>>> = (|| {
+            let attr_map: Result<HashMap<ewwii_shared_util::AttrName, Option<simplexpr::SimplExpr>>> = (|| {
                 Ok(::maplit::hashmap! {
                     $(
-                        eww_shared_util::AttrName(::std::stringify!($attr_name).to_owned()) =>
+                        ewwii_shared_util::AttrName(::std::stringify!($attr_name).to_owned()) =>
                             def_widget!(@get_value $args, &::std::stringify!($attr_name).replace('_', "-"), $(? $($optional)?)? $(= $default)?)
                     ),*
                 })
@@ -33,7 +33,7 @@ macro_rules! def_widget {
                 if attr_map.values().any(|x| x.is_some()) {
 
                     // Get all the variables that are referred to in any of the attributes expressions
-                    let required_vars: Vec<eww_shared_util::VarName> = attr_map
+                    let required_vars: Vec<ewwii_shared_util::VarName> = attr_map
                         .values()
                         .flat_map(|expr| expr.as_ref().map(|x| x.collect_var_refs()).unwrap_or_default())
                         .collect();

crates/ewwii/src/widgets/widget_definitions.rs

@@ -7,7 +7,7 @@ use crate::{
 };
 use anyhow::{anyhow, Context, Result};
 use codespan_reporting::diagnostic::Severity;
-use eww_shared_util::Spanned;
+use ewwii_shared_util::Spanned;
 
 use gdk::{ModifierType, NotifyType};
 use glib::translate::FromGlib;

crates/ewwii/src/window_arguments.rs

@@ -1,5 +1,5 @@
 use anyhow::{bail, Context, Result};
-use eww_shared_util::VarName;
+use ewwii_shared_util::VarName;
 use simplexpr::dynval::DynVal;
 use std::{
     collections::{HashMap, HashSet},

crates/ewwii/src/window_initiator.rs

@@ -1,5 +1,5 @@
 use anyhow::Result;
-use eww_shared_util::{AttrName, VarName};
+use ewwii_shared_util::{AttrName, VarName};
 use simplexpr::dynval::DynVal;
 use std::collections::HashMap;
 // TODO: Yuck found, have to replace with lua

crates/ewwii_shared_util/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "eww_shared_util"
+name = "ewwii_shared_util"
 version = "0.1.0"
 authors = ["byson94 <byson94wastaken@gmail.com>"]
 edition = "2021"

crates/simplexpr/Cargo.toml

@@ -12,7 +12,7 @@ homepage = "https://github.com/elkowar/eww"
 build = "build.rs"
 
 [dependencies]
-eww_shared_util.workspace = true
+ewwii_shared_util.workspace = true
 
 bytesize.workspace = true
 cached.workspace = true

crates/simplexpr/src/ast.rs

@@ -1,9 +1,9 @@
 use crate::dynval::DynVal;
-use eww_shared_util::{Span, Spanned};
+use ewwii_shared_util::{Span, Spanned};
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
 
-use eww_shared_util::VarName;
+use ewwii_shared_util::VarName;
 
 #[rustfmt::skip]
 #[derive(Clone, PartialEq, Eq, Serialize, Deserialize, Debug, strum::EnumString, strum::Display)]

crates/simplexpr/src/dynval.rs

@@ -1,4 +1,4 @@
-use eww_shared_util::{Span, Spanned};
+use ewwii_shared_util::{Span, Spanned};
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
 use std::{convert::TryFrom, fmt, iter::FromIterator, str::FromStr};

crates/simplexpr/src/error.rs

@@ -1,5 +1,5 @@
 use crate::parser::lexer::{self, LexicalError};
-use eww_shared_util::{Span, Spanned};
+use ewwii_shared_util::{Span, Spanned};
 
 #[derive(thiserror::Error, Debug)]
 #[error("Error parsing expression: {source}")]

crates/simplexpr/src/eval.rs

@@ -8,7 +8,7 @@ use crate::{
     ast::{AccessType, BinOp, SimplExpr, UnaryOp},
     dynval::{ConversionError, DynVal},
 };
-use eww_shared_util::{get_locale, Span, Spanned, VarName};
+use ewwii_shared_util::{get_locale, Span, Spanned, VarName};
 use std::{
     collections::HashMap,
     convert::{Infallible, TryFrom, TryInto},

crates/simplexpr/src/parser/lalrpop_helpers.rs

@@ -1,4 +1,4 @@
-use eww_shared_util::Span;
+use ewwii_shared_util::Span;
 
 use crate::SimplExpr;
 

crates/simplexpr/src/parser/lexer.rs

@@ -1,4 +1,4 @@
-use eww_shared_util::{Span, Spanned};
+use ewwii_shared_util::{Span, Spanned};
 use once_cell::sync::Lazy;
 use regex::{Regex, RegexSet};
 
@@ -291,7 +291,7 @@ impl std::fmt::Display for LexicalError {
 #[cfg(test)]
 mod test {
     use super::*;
-    use eww_shared_util::snapshot_string;
+    use ewwii_shared_util::snapshot_string;
     use itertools::Itertools;
 
     macro_rules! v {

crates/simplexpr/src/simplexpr_parser.lalrpop

@@ -1,5 +1,5 @@
 use crate::ast::{SimplExpr::{self, *}, BinOp::*, UnaryOp::*, AccessType};
-use eww_shared_util::{Span, VarName};
+use ewwii_shared_util::{Span, VarName};
 use crate::parser::lexer::{Token, LexicalError, StrLitSegment, Sp};
 use crate::parser::lalrpop_helpers::*;
 

crates/yuck/Cargo.toml

@@ -12,7 +12,7 @@ build = "build.rs"
 
 [dependencies]
 simplexpr.workspace = true
-eww_shared_util.workspace = true
+ewwii_shared_util.workspace = true
 
 anyhow.workspace = true
 codespan-reporting.workspace = true

crates/yuck/src/ast_error.rs

@@ -1,4 +1,4 @@
-use eww_shared_util::{AttrName, Span};
+use ewwii_shared_util::{AttrName, Span};
 
 use crate::{format_diagnostic::ToDiagnostic, gen_diagnostic, parser::ast::AstType};
 
@@ -44,7 +44,7 @@ impl ToDiagnostic for AstError {
     }
 }
 
-impl eww_shared_util::Spanned for AstError {
+impl ewwii_shared_util::Spanned for AstError {
     fn span(&self) -> Span {
         match self {
             AstError::NoMoreElementsExpected(span) => *span,

crates/yuck/src/config/attributes.rs

@@ -6,7 +6,7 @@ use crate::{
     error::{DiagError, DiagResult},
     parser::{ast::Ast, from_ast::FromAst},
 };
-use eww_shared_util::{AttrName, Span, Spanned};
+use ewwii_shared_util::{AttrName, Span, Spanned};
 
 #[derive(Debug, thiserror::Error)]
 pub enum AttrError {

crates/yuck/src/config/backend_window_options.rs

@@ -14,7 +14,7 @@ use crate::{
     parser::{ast::Ast, ast_iterator::AstIterator, from_ast::FromAstElementContent},
     value::{coords, NumWithUnit},
 };
-use eww_shared_util::{Span, VarName};
+use ewwii_shared_util::{Span, VarName};
 use simplexpr::dynval::ConversionError;
 
 use crate::error::{DiagError, DiagResultExt};

crates/yuck/src/config/file_provider.rs

@@ -1,4 +1,4 @@
-use eww_shared_util::Span;
+use ewwii_shared_util::Span;
 
 use crate::{error::DiagError, parser::ast::Ast};
 

crates/yuck/src/config/script_var_definition.rs

@@ -5,7 +5,7 @@ use crate::{
     format_diagnostic::ToDiagnostic,
     parser::{ast::Ast, ast_iterator::AstIterator, from_ast::FromAstElementContent},
 };
-use eww_shared_util::{Span, VarName};
+use ewwii_shared_util::{Span, VarName};
 
 #[derive(Clone, Debug, PartialEq, Eq, serde::Serialize)]
 pub enum ScriptVarDefinition {

crates/yuck/src/config/toplevel.rs

@@ -22,7 +22,7 @@ use crate::{
         from_ast::{FromAst, FromAstElementContent},
     },
 };
-use eww_shared_util::{Span, Spanned, VarName};
+use ewwii_shared_util::{Span, Spanned, VarName};
 
 static TOP_LEVEL_DEFINITION_NAMES: &[&str] = &[
     WidgetDefinition::ELEMENT_NAME,

crates/yuck/src/config/validate.rs

@@ -3,7 +3,7 @@ use std::collections::{HashMap, HashSet};
 use simplexpr::SimplExpr;
 
 use super::{widget_definition::WidgetDefinition, widget_use::WidgetUse, Config};
-use eww_shared_util::{AttrName, Span, Spanned, VarName};
+use ewwii_shared_util::{AttrName, Span, Spanned, VarName};
 
 #[derive(Debug, thiserror::Error)]
 pub enum ValidationError {

crates/yuck/src/config/var_definition.rs

@@ -4,7 +4,7 @@ use crate::{
     error::{DiagResult, DiagResultExt},
     parser::{ast::Ast, ast_iterator::AstIterator, from_ast::FromAstElementContent},
 };
-use eww_shared_util::{Span, VarName};
+use ewwii_shared_util::{Span, VarName};
 
 #[derive(Debug, PartialEq, Eq, Clone, serde::Serialize)]
 pub struct VarDefinition {

crates/yuck/src/config/widget_definition.rs

@@ -8,7 +8,7 @@ use crate::{
         from_ast::{FromAst, FromAstElementContent},
     },
 };
-use eww_shared_util::{Span, Spanned};
+use ewwii_shared_util::{Span, Spanned};
 
 use super::{attributes::AttrSpec, widget_use::WidgetUse};
 

crates/yuck/src/config/widget_use.rs

@@ -10,7 +10,7 @@ use crate::{
         from_ast::{FromAst, FromAstElementContent},
     },
 };
-use eww_shared_util::{AttrName, Span, Spanned, VarName};
+use ewwii_shared_util::{AttrName, Span, Spanned, VarName};
 
 use super::attributes::Attributes;
 

crates/yuck/src/config/window_definition.rs

@@ -9,7 +9,7 @@ use crate::{
         from_ast::{FromAst, FromAstElementContent},
     },
 };
-use eww_shared_util::{Span, VarName};
+use ewwii_shared_util::{Span, VarName};
 use simplexpr::{
     dynval::{DynVal, FromDynVal},
     eval::EvalError,

crates/yuck/src/config/window_geometry.rs

@@ -9,7 +9,7 @@ use crate::{
 };
 
 use super::window_definition::EnumParseError;
-use eww_shared_util::{Span, VarName};
+use ewwii_shared_util::{Span, VarName};
 use serde::{Deserialize, Serialize};
 use simplexpr::{
     dynval::{DynVal, FromDynVal},

crates/yuck/src/error.rs

@@ -3,7 +3,7 @@ use crate::{
     parser::{lexer, parse_error},
 };
 use codespan_reporting::diagnostic;
-use eww_shared_util::{Span, Spanned};
+use ewwii_shared_util::{Span, Spanned};
 use simplexpr::dynval;
 use thiserror::Error;
 

crates/yuck/src/format_diagnostic.rs

@@ -7,7 +7,7 @@ use diagnostic::*;
 use crate::config::{attributes::AttrError, validate::ValidationError};
 
 use super::parser::parse_error;
-use eww_shared_util::{Span, Spanned};
+use ewwii_shared_util::{Span, Spanned};
 
 pub fn span_to_primary_label(span: Span) -> Label<usize> {
     Label::primary(span.2, span.0..span.1)

crates/yuck/src/parser/ast.rs

@@ -1,7 +1,7 @@
 use itertools::Itertools;
 use simplexpr::ast::SimplExpr;
 
-use eww_shared_util::{Span, Spanned, VarName};
+use ewwii_shared_util::{Span, Spanned, VarName};
 use std::fmt::Display;
 
 use super::ast_iterator::AstIterator;

crates/yuck/src/parser/ast_iterator.rs

@@ -6,7 +6,7 @@ use crate::{
     ast_error::AstError,
     config::attributes::{AttrEntry, Attributes},
 };
-use eww_shared_util::{AttrName, Span, Spanned, VarName};
+use ewwii_shared_util::{AttrName, Span, Spanned, VarName};
 
 /// Iterator over [`crate::parser::ast::Ast`] nodes which allows to explicitly expect specific types of items
 pub struct AstIterator<I: Iterator<Item = Ast>> {
@@ -19,7 +19,7 @@ macro_rules! return_or_put_back {
         $(
             pub fn $name(&mut self) -> Result<$t, AstError> {
                 let expr_type = $expr_type;
-                use eww_shared_util::Spanned;
+                use ewwii_shared_util::Spanned;
                 match self.expect_any()? {
                     $p => Ok($ret),
                     other => {

crates/yuck/src/parser/from_ast.rs

@@ -1,6 +1,6 @@
 use super::{ast::Ast, ast_iterator::AstIterator};
 use crate::{error::*, format_diagnostic::ToDiagnostic, gen_diagnostic};
-use eww_shared_util::{Span, Spanned};
+use ewwii_shared_util::{Span, Spanned};
 
 use simplexpr::ast::SimplExpr;
 

crates/yuck/src/parser/lexer.rs

@@ -2,7 +2,7 @@ use once_cell::sync::Lazy;
 use regex::{Regex, RegexSet};
 
 use super::parse_error;
-use eww_shared_util::{Span, Spanned};
+use ewwii_shared_util::{Span, Spanned};
 
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub enum Token {
@@ -179,7 +179,7 @@ impl Iterator for Lexer {
 mod test {
 
     use super::*;
-    use eww_shared_util::snapshot_string;
+    use ewwii_shared_util::snapshot_string;
     use itertools::Itertools;
 
     macro_rules! v {

crates/yuck/src/parser/mod.rs

@@ -1,4 +1,4 @@
-use eww_shared_util::{Span, Spanned};
+use ewwii_shared_util::{Span, Spanned};
 use lalrpop_util::lalrpop_mod;
 
 use crate::gen_diagnostic;

crates/yuck/src/parser/parse_error.rs

@@ -1,4 +1,4 @@
-use eww_shared_util::{Span, Spanned};
+use ewwii_shared_util::{Span, Spanned};
 
 #[derive(Debug, thiserror::Error)]
 pub enum ParseError {

crates/yuck/src/parser/parser.lalrpop

@@ -1,5 +1,5 @@
 use crate::parser::{lexer::Token, ast::Ast, parse_error};
-use eww_shared_util::Span;
+use ewwii_shared_util::Span;
 use simplexpr::ast::SimplExpr;
 use simplexpr;
 use lalrpop_util::ParseError;