diff options
author | Rickard Green <rickard@erlang.org> | 2020-05-08 11:53:21 +0200 |
---|---|---|
committer | Rickard Green <rickard@erlang.org> | 2020-05-08 11:53:21 +0200 |
commit | ae48e045a87bf0a36fd36641dffdf397d120da4e (patch) | |
tree | dc796e52dc439aff0e75992d6eed916593998397 /lib | |
parent | b39c4b2a64649fccb73ef4484a8e9e2d32804354 (diff) | |
parent | ecbc66470be44964f495fbdb1185cdd056825a9c (diff) | |
download | erlang-ae48e045a87bf0a36fd36641dffdf397d120da4e.tar.gz |
Merge branch 'maint'
* maint:
Fix dirty check process code
Fix literal area gc bug
Suppress Dialyzer warnings of type no_match in generated files
Correct printout that shows which encoding rules the tests are done for.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/asn1/src/asn1ct_gen.erl | 4 | ||||
-rw-r--r-- | lib/asn1/test/testEnumExt.erl | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/asn1/src/asn1ct_gen.erl b/lib/asn1/src/asn1ct_gen.erl index 4f8b428b54..30396821b7 100644 --- a/lib/asn1/src/asn1ct_gen.erl +++ b/lib/asn1/src/asn1ct_gen.erl @@ -1314,7 +1314,9 @@ gen_head(#gen{options=Options}=Gen, Mod, Hrl) -> Mod,".",nl,nl, "-module('",Mod,"').",nl, "-compile(nowarn_unused_vars).",nl, - "-dialyzer(no_improper_lists).",nl]), + "-dialyzer(no_improper_lists).",nl, + "-dialyzer(no_match).",nl + ]), case Hrl of 0 -> ok; _ -> emit(["-include(\"",Mod,".hrl\").",nl]) diff --git a/lib/asn1/test/testEnumExt.erl b/lib/asn1/test/testEnumExt.erl index b30750f7fc..cb01ad481f 100644 --- a/lib/asn1/test/testEnumExt.erl +++ b/lib/asn1/test/testEnumExt.erl @@ -41,7 +41,7 @@ main(Rule) when Rule =:= per; Rule =:= uper -> B64 = roundtrip('Noext', red), common(Rule); main(Rule) when Rule =:= ber; Rule =:= jer -> - io:format("main(ber)~n",[]), + io:format("main(~p)~n",[Rule]), %% ENUMERATED with extensionmark (value is in root set) roundtrip('Ext', red), |