From 844cf6a794d7910524bd7606cae0eef0ba1c4843 Mon Sep 17 00:00:00 2001 From: William Carroll Date: Tue, 2 Aug 2022 13:25:30 -0700 Subject: refactor(wpcarro/emacs): Remove struct.el dep on s.el This removes *all* of `struct.el`'s dependencies, which is liberating. Change-Id: Ic4a2438714ecf547ba5e07a1f0e77d743941073c Reviewed-on: https://cl.tvl.fyi/c/depot/+/6029 Tested-by: BuildkiteCI Reviewed-by: wpcarro Autosubmit: wpcarro --- users/wpcarro/emacs/pkgs/struct/default.nix | 5 +---- users/wpcarro/emacs/pkgs/struct/struct.el | 15 +++++---------- 2 files changed, 6 insertions(+), 14 deletions(-) (limited to 'users/wpcarro') diff --git a/users/wpcarro/emacs/pkgs/struct/default.nix b/users/wpcarro/emacs/pkgs/struct/default.nix index 1b8b27457a..026bdb61ac 100644 --- a/users/wpcarro/emacs/pkgs/struct/default.nix +++ b/users/wpcarro/emacs/pkgs/struct/default.nix @@ -7,10 +7,7 @@ let pname = "struct"; version = "1.0.0"; src = ./struct.el; - packageRequires = - (with emacsPackages; [ - s - ]); + packageRequires = [ ]; }) { }; diff --git a/users/wpcarro/emacs/pkgs/struct/struct.el b/users/wpcarro/emacs/pkgs/struct/struct.el index 177878c5e1..5d6572bf6d 100644 --- a/users/wpcarro/emacs/pkgs/struct/struct.el +++ b/users/wpcarro/emacs/pkgs/struct/struct.el @@ -1,7 +1,7 @@ ;;; struct.el --- Helpers for working with structs -*- lexical-binding: t -*- ;; Author: William Carroll -;; Version: 0.0.1 +;; Version: 1.0.0 ;; Package-Requires: ((emacs "24.3")) ;;; Commentary: @@ -13,12 +13,6 @@ ;;; Code: -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Dependencies -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(require 's) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Library ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -60,11 +54,12 @@ This is an adapter interface to `setf'." ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (defun struct--copier-for (type) - (intern (s-prepend "copy-" (symbol-name type)))) + (intern (format "copy-%s" (symbol-name type)))) (defun struct--accessor-for (type field) - (intern (s-prepend (s-concat (symbol-name type) "-") - (symbol-name field)))) + (intern (format "%s-%s" + (symbol-name type) + (symbol-name field)))) (provide 'struct) ;;; struct.el ends here -- cgit 1.4.1