Fix elixir 1.3.0-dev warnings

lib/ex_doc.ex

@@ -91,10 +91,10 @@ defmodule ExDoc do
     options = Keyword.put(options, :source_url_pattern, pattern)
 
     if is_bitstring(options[:output]) do
-      options = Keyword.put(options, :output, String.rstrip(options[:output], ?/))
+      Keyword.put(options, :output, String.rstrip(options[:output], ?/))
+    else
+      options
     end
-
-    options
   end
 
   defp guess_url(url = <<"https://github.com/", _ :: binary>>, ref) do

lib/ex_doc/formatter/html.ex

@@ -25,9 +25,10 @@ defmodule ExDoc.Formatter.HTML do
     exceptions = filter_list(:exceptions, all)
     protocols  = filter_list(:protocols, all)
 
-    if config.logo do
-      config = process_logo_metadata(config)
-    end
+    config =
+      if config.logo do
+        process_logo_metadata(config)
+      end
 
     generate_api_reference(modules, exceptions, protocols, output, config)
     extras = generate_extras(output, module_nodes, modules, exceptions, protocols, config)

lib/ex_doc/formatter/html/autolink.ex

@@ -273,10 +273,12 @@ defmodule ExDoc.Formatter.HTML.Autolink do
     |> Enum.filter(&(&1 in modules))
     |> Enum.reduce(bin, fn (x, acc) ->
          escaped = Regex.escape(x)
-         suffix = ".html"
-         if module_id && x == module_id do
-           suffix = suffix <> "#content"
-         end
+         suffix =
+           if module_id && x == module_id do
+             ".html#content"
+           else
+             ".html"
+           end
          Regex.replace(~r/(?<!\[)`(\s*#{escaped}\s*)`(?!\])/, acc,
            "[`\\1`](\\1" <> suffix <> ")")
        end)

lib/ex_doc/retriever.ex

@@ -183,9 +183,12 @@ defmodule ExDoc.Retriever do
 
     behaviour = Map.get(cb_impls, {name, arity})
 
-    if is_nil(doc) && behaviour do
-      doc = "Callback implementation for `c:#{inspect behaviour}.#{name}/#{arity}`."
-    end
+    doc =
+      if is_nil(doc) && behaviour do
+        "Callback implementation for `c:#{inspect behaviour}.#{name}/#{arity}`."
+      else
+        doc
+      end
 
     specs = all_specs
             |> Map.get(function, [])

lib/mix/tasks/docs.ex

@@ -84,9 +84,12 @@ defmodule Mix.Tasks.Docs do
     version = config[:version] || "dev"
     options = Keyword.merge(get_docs_opts(config), cli_opts)
 
-    if config[:source_url] do
-      options = Keyword.put(options, :source_url, config[:source_url])
-    end
+    options =
+      if config[:source_url] do
+        Keyword.put(options, :source_url, config[:source_url])
+      else
+        options
+      end
 
     main = options[:main]
     options =