diff options
| author | Erlang/OTP <otp@erlang.org> | 2020-05-08 11:34:55 +0200 |
|---|---|---|
| committer | Erlang/OTP <otp@erlang.org> | 2020-05-08 11:34:55 +0200 |
| commit | 9d3bc6e5b3bceeba8408b3b386bcd0e3c7c3bf0d (patch) | |
| tree | cd71540f133dd64710d64ed148d3a57778b980a2 | |
| parent | 727e22ffa10db210f0a678b61010f6eb7d8839d8 (diff) | |
| parent | 1debde29a39d5a794a8434988cf93a2873b32443 (diff) | |
| download | erlang-9d3bc6e5b3bceeba8408b3b386bcd0e3c7c3bf0d.tar.gz | |
Merge branch 'kenneth/asn1_dialyzer/OTP-16636' into maint-22
* kenneth/asn1_dialyzer/OTP-16636:
Suppress Dialyzer warnings of type no_match in generated files
Correct printout that shows which encoding rules the tests are done for.
| -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), |