From 007853bff9d2fdd94b099a2bf0861e93aa61a63d Mon Sep 17 00:00:00 2001 From: Sean Cribbs Date: Wed, 11 Mar 2015 10:56:11 -0500 Subject: [PATCH] Fix type specs for usage registration. This was missed when the function form of usage was created, resulting in the 'clique' module having a narrower spec than the 'clique_usage' module. Prompted by basho/riak_repl#660. --- src/clique.erl | 2 +- src/clique_usage.erl | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/clique.erl b/src/clique.erl index 62d9269..acbaedf 100644 --- a/src/clique.erl +++ b/src/clique.erl @@ -76,7 +76,7 @@ register_command(Cmd, Keys, Flags, Fun) -> %% @doc Register usage for a given command sequence. Lookups are by longest %% match. --spec register_usage([string()], iolist()) -> true. +-spec register_usage([string()], clique_usage:usage()) -> true. register_usage(Cmd, Usage) -> clique_usage:register(Cmd, Usage). diff --git a/src/clique_usage.erl b/src/clique_usage.erl index 3b17eba..def877a 100644 --- a/src/clique_usage.erl +++ b/src/clique_usage.erl @@ -29,6 +29,9 @@ -type err() :: {error, term()}. -type usage_function() :: fun(() -> iolist()). +-type usage() :: iolist() | usage_function(). + +-export_type([usage/0]). %% API -export([init/0, @@ -42,7 +45,7 @@ init() -> %% @doc Register usage for a given command sequence. Lookups are by longest %% match. --spec register([string()], iolist() | usage_function()) -> true. +-spec register([string()], usage()) -> true. register(Cmd, Usage) -> ets:insert(?usage_table, {Cmd, Usage}).