diff options
| author | Björn Gustavsson <[email protected]> | 2010-10-04 15:47:06 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2010-10-04 15:47:06 +0200 |
| commit | 3cfec17ff7aff97c5ec862a8b9e97d245849f9c3 (patch) | |
| tree | 34c6d7ccd08d0312da1d83380de8defce62a4172 /lib/stdlib/src/lists.erl | |
| parent | 29a550156d88eb2899bceaa07c46369f97539336 (diff) | |
| parent | 7c64e547eff945059732384617676b1cafc11117 (diff) | |
| download | otp-3cfec17ff7aff97c5ec862a8b9e97d245849f9c3.tar.gz otp-3cfec17ff7aff97c5ec862a8b9e97d245849f9c3.tar.bz2 otp-3cfec17ff7aff97c5ec862a8b9e97d245849f9c3.zip | |
Merge branch 'ks/stdlib-spec-fixes' into dev
* ks/stdlib-spec-fixes:
Correct erroneous specs; strengthen some others
Diffstat (limited to 'lib/stdlib/src/lists.erl')
| -rw-r--r-- | lib/stdlib/src/lists.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/stdlib/src/lists.erl b/lib/stdlib/src/lists.erl index 08ee595f4d..431e5b114e 100644 --- a/lib/stdlib/src/lists.erl +++ b/lib/stdlib/src/lists.erl @@ -350,7 +350,7 @@ sort_1(X, [], R) -> %% merge(List) -> L %% merges a list of sorted lists --spec merge([T]) -> [T]. +-spec merge([[T]]) -> [T]. merge(L) -> mergel(L, []). @@ -842,7 +842,7 @@ usort_1(X, []) -> %% umerge(List) -> L %% merges a list of sorted lists without duplicates, removes duplicates --spec umerge([T]) -> [T]. +-spec umerge([[T]]) -> [T]. umerge(L) -> umergel(L). |