From 4860b247891cc8f1ce74e35b658ffaa3ee3381b8 Mon Sep 17 00:00:00 2001 From: Jonas Enlund Date: Fri, 23 Mar 2012 21:50:29 +0200 Subject: [PATCH] Get rid of ego ns --- src/{jonase => }/kibit/core.clj | 6 +++--- src/{jonase => }/kibit/guards.clj | 2 +- src/{jonase => }/kibit/reporters.clj | 2 +- src/{jonase => }/kibit/rules.clj | 14 +++++++------- src/{jonase => }/kibit/rules/arithmetic.clj | 4 ++-- src/{jonase => }/kibit/rules/collections.clj | 4 ++-- .../kibit/rules/control_structures.clj | 4 ++-- src/{jonase => }/kibit/rules/equality.clj | 4 ++-- src/{jonase => }/kibit/rules/misc.clj | 6 +++--- src/{jonase => }/kibit/rules/performance.clj | 4 ++-- src/{jonase => }/kibit/rules/util.clj | 2 +- src/leiningen/kibit.clj | 2 +- 12 files changed, 27 insertions(+), 27 deletions(-) rename src/{jonase => }/kibit/core.clj (98%) rename src/{jonase => }/kibit/guards.clj (91%) rename src/{jonase => }/kibit/reporters.clj (96%) rename src/{jonase => }/kibit/rules.clj (76%) rename src/{jonase => }/kibit/rules/arithmetic.clj (63%) rename src/{jonase => }/kibit/rules/collections.clj (61%) rename src/{jonase => }/kibit/rules/control_structures.clj (88%) rename src/{jonase => }/kibit/rules/equality.clj (79%) rename src/{jonase => }/kibit/rules/misc.clj (89%) rename src/{jonase => }/kibit/rules/performance.clj (50%) rename src/{jonase => }/kibit/rules/util.clj (74%) diff --git a/src/jonase/kibit/core.clj b/src/kibit/core.clj similarity index 98% rename from src/jonase/kibit/core.clj rename to src/kibit/core.clj index eaa953c..9977fb2 100644 --- a/src/jonase/kibit/core.clj +++ b/src/kibit/core.clj @@ -1,11 +1,11 @@ -(ns jonase.kibit.core +(ns kibit.core "Kibit's core functionality uses core.logic to suggest idiomatic replacements for patterns of code." (:require [clojure.java.io :as io] [clojure.walk :as walk] [clojure.core.logic :as logic] - [jonase.kibit.rules :as core-rules] - [jonase.kibit.reporters :as reporters]) + [kibit.rules :as core-rules] + [kibit.reporters :as reporters]) (:import [clojure.lang LineNumberingPushbackReader])) ;; ### Important notes diff --git a/src/jonase/kibit/guards.clj b/src/kibit/guards.clj similarity index 91% rename from src/jonase/kibit/guards.clj rename to src/kibit/guards.clj index c029f2f..8a988b0 100644 --- a/src/jonase/kibit/guards.clj +++ b/src/kibit/guards.clj @@ -1,4 +1,4 @@ -(ns jonase.kibit.guards +(ns kibit.guards (:require [clojure.core.logic :as logic])) (defn not-method? [sym] diff --git a/src/jonase/kibit/reporters.clj b/src/kibit/reporters.clj similarity index 96% rename from src/jonase/kibit/reporters.clj rename to src/kibit/reporters.clj index ef6a771..d46a859 100644 --- a/src/jonase/kibit/reporters.clj +++ b/src/kibit/reporters.clj @@ -1,4 +1,4 @@ -(ns jonase.kibit.reporters +(ns kibit.reporters (:require [clojure.string :as string] [clojure.pprint :as pp]) (:import [java.io StringWriter])) diff --git a/src/jonase/kibit/rules.clj b/src/kibit/rules.clj similarity index 76% rename from src/jonase/kibit/rules.clj rename to src/kibit/rules.clj index 25bbaf1..0638fd6 100644 --- a/src/jonase/kibit/rules.clj +++ b/src/kibit/rules.clj @@ -1,13 +1,13 @@ -(ns jonase.kibit.rules +(ns kibit.rules "`rules.clj` provides the core functionality for extracting and merging rules from namespaces. There are shorthands for the individual rule sets, via the `rule-map`" - (:require [jonase.kibit.rules.arithmetic :as arith] - [jonase.kibit.rules.control-structures :as control] - [jonase.kibit.rules.collections :as coll] - [jonase.kibit.rules.equality :as equality] - [jonase.kibit.rules.performance :as perf] - [jonase.kibit.rules.misc :as misc])) + (:require [kibit.rules.arithmetic :as arith] + [kibit.rules.control-structures :as control] + [kibit.rules.collections :as coll] + [kibit.rules.equality :as equality] + [kibit.rules.performance :as perf] + [kibit.rules.misc :as misc])) ;; More information on rules ;; ------------------------- diff --git a/src/jonase/kibit/rules/arithmetic.clj b/src/kibit/rules/arithmetic.clj similarity index 63% rename from src/jonase/kibit/rules/arithmetic.clj rename to src/kibit/rules/arithmetic.clj index 81d319f..c4d8b69 100644 --- a/src/jonase/kibit/rules/arithmetic.clj +++ b/src/kibit/rules/arithmetic.clj @@ -1,5 +1,5 @@ -(ns jonase.kibit.rules.arithmetic - (:use [jonase.kibit.rules.util :only [defrules]])) +(ns kibit.rules.arithmetic + (:use [kibit.rules.util :only [defrules]])) (defrules rules [(+ ?x 1) (inc ?x)] diff --git a/src/jonase/kibit/rules/collections.clj b/src/kibit/rules/collections.clj similarity index 61% rename from src/jonase/kibit/rules/collections.clj rename to src/kibit/rules/collections.clj index 498a1ef..7ebcea6 100644 --- a/src/jonase/kibit/rules/collections.clj +++ b/src/kibit/rules/collections.clj @@ -1,5 +1,5 @@ -(ns jonase.kibit.rules.collections - (:use [jonase.kibit.rules.util :only [defrules]])) +(ns kibit.rules.collections + (:use [kibit.rules.util :only [defrules]])) (defrules rules ;;vector diff --git a/src/jonase/kibit/rules/control_structures.clj b/src/kibit/rules/control_structures.clj similarity index 88% rename from src/jonase/kibit/rules/control_structures.clj rename to src/kibit/rules/control_structures.clj index b9906d8..16d6fdc 100644 --- a/src/jonase/kibit/rules/control_structures.clj +++ b/src/kibit/rules/control_structures.clj @@ -1,5 +1,5 @@ -(ns jonase.kibit.rules.control-structures - (:use [jonase.kibit.rules.util :only [defrules]])) +(ns kibit.rules.control-structures + (:use [kibit.rules.util :only [defrules]])) (defrules rules [(if ?x ?y nil) (when ?x ?y)] diff --git a/src/jonase/kibit/rules/equality.clj b/src/kibit/rules/equality.clj similarity index 79% rename from src/jonase/kibit/rules/equality.clj rename to src/kibit/rules/equality.clj index 65d2432..733401d 100644 --- a/src/jonase/kibit/rules/equality.clj +++ b/src/kibit/rules/equality.clj @@ -1,5 +1,5 @@ -(ns jonase.kibit.rules.equality - (:use [jonase.kibit.rules.util :only [defrules]])) +(ns kibit.rules.equality + (:use [kibit.rules.util :only [defrules]])) (defrules rules ;; not= diff --git a/src/jonase/kibit/rules/misc.clj b/src/kibit/rules/misc.clj similarity index 89% rename from src/jonase/kibit/rules/misc.clj rename to src/kibit/rules/misc.clj index 09a69a8..3980621 100644 --- a/src/jonase/kibit/rules/misc.clj +++ b/src/kibit/rules/misc.clj @@ -1,6 +1,6 @@ -(ns jonase.kibit.rules.misc - (:require [jonase.kibit.guards :as guards]) - (:use [jonase.kibit.rules.util :only [defrules]])) +(ns kibit.rules.misc + (:require [kibit.guards :as guards]) + (:use [kibit.rules.util :only [defrules]])) (defrules rules ;; clojure.string diff --git a/src/jonase/kibit/rules/performance.clj b/src/kibit/rules/performance.clj similarity index 50% rename from src/jonase/kibit/rules/performance.clj rename to src/kibit/rules/performance.clj index 141df35..12fe834 100644 --- a/src/jonase/kibit/rules/performance.clj +++ b/src/kibit/rules/performance.clj @@ -1,5 +1,5 @@ -(ns jonase.kibit.rules.performance - (:use [jonase.kibit.rules.util :only [defrules]])) +(ns kibit.rules.performance + (:use [kibit.rules.util :only [defrules]])) (defrules rules ;; reduce on var-arg functions diff --git a/src/jonase/kibit/rules/util.clj b/src/kibit/rules/util.clj similarity index 74% rename from src/jonase/kibit/rules/util.clj rename to src/kibit/rules/util.clj index abe3395..bc854ad 100644 --- a/src/jonase/kibit/rules/util.clj +++ b/src/kibit/rules/util.clj @@ -1,4 +1,4 @@ -(ns jonase.kibit.rules.util) +(ns kibit.rules.util) (defmacro defrules [name & rules] (let [rules (for [[pat alt & {:keys [when]}] rules] diff --git a/src/leiningen/kibit.clj b/src/leiningen/kibit.clj index 9944b26..9756a44 100644 --- a/src/leiningen/kibit.clj +++ b/src/leiningen/kibit.clj @@ -1,7 +1,7 @@ (ns leiningen.kibit (:require [clojure.tools.namespace :as clj-ns] [clojure.java.io :as io] - [jonase.kibit.core :as kibit])) + [kibit.core :as kibit])) (defn kibit "Suggest idiomatic replacements for patterns of code."