Merge branch 'maint'

* maint:
  xmerl: Remove 'no_return' Dialyzer warnings
  xmerl: Add suppression of Dialyzer warnings
  eunit: Add suppression of Dialyzer warnings
  debugger: Add suppression of Dialyzer warnings
  kernel: Add suppression of Dialyzer warnings
  mnesia: Add suppression of Dialyzer warnings
  observer: Add suppression of Dialyzer warnings
  runtime_tools: Add suppression of Dialyzer warnings
  stdlib: Add suppression of Dialyzer warnings
  test_server: Add suppression of Dialyzer warnings
  tools: Add suppression of Dialyzer warnings

Conflicts:
	lib/stdlib/src/erl_lint.erl
	lib/stdlib/src/otp_internal.erl

7 files changed, 43 insertions, 26 deletions

diff --git a/lib/eunit/src/eunit_data.erl b/lib/eunit/src/eunit_data.erl
index 8b53a3681d..cc002cb449 100644
--- a/lib/eunit/src/eunit_data.erl
+++ b/lib/eunit/src/eunit_data.erl
@@ -761,6 +761,7 @@ lazy_test_() ->
 	     lazy_gen(7),
 	     ?_assertMatch(7, get(count))]}.
 
+-dialyzer({no_improper_lists, lazy_gen/1}).
 lazy_gen(N) ->
     {generator,
      fun () ->
diff --git a/lib/eunit/src/eunit_lib.erl b/lib/eunit/src/eunit_lib.erl
index d8f98cffa5..4dbe023257 100644
--- a/lib/eunit/src/eunit_lib.erl
+++ b/lib/eunit/src/eunit_lib.erl
@@ -192,6 +192,7 @@ error_msg(Title, Fmt, Args) ->
     io_lib:fwrite("*** ~ts ***\n~ts\n\n", [Title, Msg]).
 
 -ifdef(TEST).
+-dialyzer({no_match, format_exception_test_/0}).
 format_exception_test_() ->
     [?_assertMatch(
         "\nymmud:rorre"++_,
@@ -273,6 +274,7 @@ dlist_next([], Xs) ->
 
 
 -ifdef(TEST).
+-dialyzer({no_match, dlist_test_/0}).
 dlist_test_() ->
     {"deep list traversal",
      [{"non-list term -> singleton list",
@@ -338,6 +340,7 @@ is_nonempty_string([]) -> false;
 is_nonempty_string(Cs) -> is_string(Cs).
 
 -ifdef(TEST).
+-dialyzer({no_match, is_string_test_/0}).
 is_string_test_() ->
     {"is_string",
      [{"no non-lists", ?_assert(not is_string($A))},
@@ -399,6 +402,7 @@ uniq([X | Xs]) -> [X | uniq(Xs)];
 uniq([]) -> [].
 
 -ifdef(TEST).
+-dialyzer({[no_match, no_fail_call, no_improper_lists], uniq_test_/0}).
 uniq_test_() ->
     {"uniq",
      [?_assertError(function_clause, uniq(ok)),
@@ -459,6 +463,7 @@ normalize([]) ->
 
 -ifdef(TEST).
 
+-dialyzer({no_match, cmd_test_/0}).
 cmd_test_() ->
     ([?_test({0, "hello\n"} = ?_cmd_("echo hello"))]
      ++ case os:type() of
@@ -576,6 +581,7 @@ trie_match([], _T) ->
 
 -ifdef(TEST).
 
+-dialyzer({no_match, trie_test_/0}).
 trie_test_() ->
     [{"basic representation",
       [?_assert(trie_new() =:= gb_trees:empty()),
diff --git a/lib/eunit/src/eunit_listener.erl b/lib/eunit/src/eunit_listener.erl
index ecaac424a2..d9b836863b 100644
--- a/lib/eunit/src/eunit_listener.erl
+++ b/lib/eunit/src/eunit_listener.erl
@@ -27,14 +27,11 @@
 
 -export([start/1, start/2]).
 
--export([behaviour_info/1]).
-
-
-behaviour_info(callbacks) ->
-    [{init,1},{handle_begin,3},{handle_end,3},{handle_cancel,3},
-     {terminate,2}];
-behaviour_info(_Other) ->
-    undefined.
+-callback init(_) -> _.
+-callback handle_begin(_, _, _) -> _.
+-callback handle_end(_, _, _) -> _.
+-callback handle_cancel(_, _, _) -> _.
+-callback terminate(_, _) -> _.
 
 
 -record(state, {callback,    % callback module
@@ -50,18 +47,22 @@ start(Callback) ->
 
 start(Callback, Options) ->
     St = #state{callback = Callback},
-    spawn_opt(fun () -> init(St, Options) end,
+    spawn_opt(init_fun(St, Options),
 	      proplists:get_all_values(spawn, Options)).
 
-init(St0, Options) ->
-    St1 = call(init, [Options], St0),
-    St2 = expect([], undefined, St1),
-    Data = [{pass, St2#state.pass},
-	    {fail, St2#state.fail},
-	    {skip, St2#state.skip},
-	    {cancel, St2#state.cancel}],
-    call(terminate, [{ok, Data}, St2#state.state], St2),
-    exit(normal).
+-spec init_fun(_, _) -> no_return().
+
+init_fun(St0, Options) ->
+    fun () ->
+            St1 = call(init, [Options], St0),
+            St2 = expect([], undefined, St1),
+            Data = [{pass, St2#state.pass},
+                    {fail, St2#state.fail},
+                    {skip, St2#state.skip},
+                    {cancel, St2#state.cancel}],
+            call(terminate, [{ok, Data}, St2#state.state], St2),
+            exit(normal)
+    end.
 
 expect(Id, ParentId, St) ->
     case wait_for(Id, 'begin', ParentId) of
diff --git a/lib/eunit/src/eunit_proc.erl b/lib/eunit/src/eunit_proc.erl
index 98ae31d54b..8bdf94c877 100644
--- a/lib/eunit/src/eunit_proc.erl
+++ b/lib/eunit/src/eunit_proc.erl
@@ -268,6 +268,8 @@ insulator_wait(Child, Parent, Buf, St) ->
 	    kill_task(Child, St)
     end.
 
+-spec kill_task(_, _) -> no_return().
+
 kill_task(Child, St) ->
     exit(Child, kill),
     terminate_insulator(St).
diff --git a/lib/eunit/src/eunit_serial.erl b/lib/eunit/src/eunit_serial.erl
index 1a0179a5df..da76064a53 100644
--- a/lib/eunit/src/eunit_serial.erl
+++ b/lib/eunit/src/eunit_serial.erl
@@ -61,14 +61,16 @@
 		messages  = dict:new()		 :: dict:dict()}).
 
 start(Pids) ->
-    spawn(fun () -> serializer(Pids) end).
-
-serializer(Pids) ->
-    St = #state{listeners = sets:from_list(Pids),
-		cancelled = eunit_lib:trie_new(),
-		messages = dict:new()},
-    expect([], undefined, 0, St),
-    exit(normal).
+    spawn(serializer_fun(Pids)).
+
+serializer_fun(Pids) ->
+    fun () ->
+            St = #state{listeners = sets:from_list(Pids),
+                        cancelled = eunit_lib:trie_new(),
+                        messages = dict:new()},
+            expect([], undefined, 0, St),
+            exit(normal)
+    end.
 
 %% collect beginning and end of an expected item; return {Done, NewSt}
 %% where Done is true if there are no more items of this group
diff --git a/lib/eunit/src/eunit_test.erl b/lib/eunit/src/eunit_test.erl
index 9cf40a738d..62d30b1930 100644
--- a/lib/eunit/src/eunit_test.erl
+++ b/lib/eunit/src/eunit_test.erl
@@ -40,6 +40,7 @@ get_stacktrace() ->
 get_stacktrace(Ts) ->
     eunit_lib:uniq(prune_trace(erlang:get_stacktrace(), Ts)).
 
+-dialyzer({no_match, prune_trace/2}).
 prune_trace([{eunit_data, _, _} | Rest], Tail) ->
     prune_trace(Rest, Tail);
 prune_trace([{eunit_data, _, _, _} | Rest], Tail) ->
@@ -75,6 +76,7 @@ run_testfun(F) ->
 
 
 -ifdef(TEST).
+-dialyzer({[no_match, no_fail_call, no_return], macro_test_/0}).
 macro_test_() ->
     {"macro definitions",
      [{?LINE, fun () ->
@@ -301,6 +303,7 @@ wrapper_test_() ->
      ]}.
 
 %% this must be exported (done automatically by the autoexport transform)
+-dialyzer({no_missing_calls, wrapper_test_exported_/0}).
 wrapper_test_exported_() ->
     {ok, ?MODULE:nonexisting_function()}.
 -endif.
diff --git a/lib/eunit/src/eunit_tests.erl b/lib/eunit/src/eunit_tests.erl
index 47ea0aaf46..5dee1cb49e 100644
--- a/lib/eunit/src/eunit_tests.erl
+++ b/lib/eunit/src/eunit_tests.erl
@@ -23,6 +23,8 @@
 
 -include("eunit.hrl").
 
+-dialyzer(no_match).
+
 -ifdef(TEST).
 id(X) -> X.  % for suppressing compiler warnings
 -endif.