From fdf249a959981c916d7f53a624c2214ed4fa4583 Mon Sep 17 00:00:00 2001 From: Vincent Cantin Date: Tue, 22 Jan 2019 08:22:48 +0800 Subject: [PATCH] Apply a change suggested by Miikka Koskinen. --- modules/reitit-core/src/reitit/core.cljc | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/modules/reitit-core/src/reitit/core.cljc b/modules/reitit-core/src/reitit/core.cljc index e88b15bc..b905915b 100644 --- a/modules/reitit-core/src/reitit/core.cljc +++ b/modules/reitit-core/src/reitit/core.cljc @@ -66,16 +66,14 @@ coerce (into [] (keep #(coerce % opts))))) (defn path-conflicting-routes [routes] - (let [conflicting-routes - (into {} - (comp (map-indexed (fn [index route] - [route (into #{} - (filter #(impl/conflicting-routes? route %)) - (subvec routes (inc index)))])) - (filter (comp seq second))) - routes)] - (when (seq conflicting-routes) - conflicting-routes))) + (-> (into {} + (comp (map-indexed (fn [index route] + [route (into #{} + (filter #(impl/conflicting-routes? route %)) + (subvec routes (inc index)))])) + (filter (comp seq second))) + routes) + (not-empty))) (defn conflicting-paths [conflicts] (->> (for [[p pc] conflicts]