diff options
author | Hans Bolinder <[email protected]> | 2018-01-23 11:37:34 +0100 |
---|---|---|
committer | Hans Bolinder <[email protected]> | 2018-01-23 11:37:34 +0100 |
commit | 716ef17d2a00c7f4a5a5cf92fffd18adb94c542d (patch) | |
tree | f517f0ae5ed2c1a6546d5d18df46dcfaf03935e1 /lib/stdlib/test/escript_SUITE_data/unicode2 | |
parent | b7ff9c0d76372f16d14ecaac04c6fbbbadaf9435 (diff) | |
parent | dc6a03a8351819a91c1e9235dd84df0acd4ba6b8 (diff) | |
download | otp-716ef17d2a00c7f4a5a5cf92fffd18adb94c542d.tar.gz otp-716ef17d2a00c7f4a5a5cf92fffd18adb94c542d.tar.bz2 otp-716ef17d2a00c7f4a5a5cf92fffd18adb94c542d.zip |
Merge branch 'maint'
* maint:
kernel: Correct contracts and a bug in group_history
stdlib: Correct contracts
dialyzer: Optimize handling of a lot of warnings
Conflicts:
lib/kernel/src/erl_boot_server.erl
Diffstat (limited to 'lib/stdlib/test/escript_SUITE_data/unicode2')
-rwxr-xr-x | lib/stdlib/test/escript_SUITE_data/unicode2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/test/escript_SUITE_data/unicode2 b/lib/stdlib/test/escript_SUITE_data/unicode2 index 495188f6f0..d0195b036c 100755 --- a/lib/stdlib/test/escript_SUITE_data/unicode2 +++ b/lib/stdlib/test/escript_SUITE_data/unicode2 @@ -8,7 +8,7 @@ main(_) -> _D = erlang:system_flag(backtrace_depth, 0), A = <<"\x{aa}">>, S = lists:flatten(io_lib:format("~p/~p.", [A, A])), - {ok, Ts, _} = erl_scan:string(S, 1, [unicode]), + {ok, Ts, _} = erl_scan:string(S, 1), {ok, Es} = erl_parse:parse_exprs(Ts), B = erl_eval:new_bindings(), erl_eval:exprs(Es, B). |