about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--users/wpcarro/emacs/pkgs/struct/default.nix5
-rw-r--r--users/wpcarro/emacs/pkgs/struct/struct.el15
2 files changed, 6 insertions, 14 deletions
diff --git a/users/wpcarro/emacs/pkgs/struct/default.nix b/users/wpcarro/emacs/pkgs/struct/default.nix
index 1b8b27457a66..026bdb61ace2 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 177878c5e1c5..5d6572bf6dde 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 <wpcarro@gmail.com>
-;; Version: 0.0.1
+;; Version: 1.0.0
 ;; Package-Requires: ((emacs "24.3"))
 
 ;;; Commentary:
@@ -14,12 +14,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