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/src/io_lib_fread.erl | |
| 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/src/io_lib_fread.erl')
| -rw-r--r-- | lib/stdlib/src/io_lib_fread.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/stdlib/src/io_lib_fread.erl b/lib/stdlib/src/io_lib_fread.erl index 983e8d4566..319bff484e 100644 --- a/lib/stdlib/src/io_lib_fread.erl +++ b/lib/stdlib/src/io_lib_fread.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2017. All Rights Reserved. +%% Copyright Ericsson AB 1996-2018. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -38,7 +38,7 @@ -spec fread(Continuation, String, Format) -> Return when Continuation :: io_lib:continuation() | [], - String :: string(), + String :: string() | 'eof', Format :: string(), Return :: {'more', Continuation1 :: io_lib:continuation()} | {'done', Result, LeftOverChars :: string()}, |