diff options
| author | Björn Gustavsson <[email protected]> | 2015-04-30 12:23:45 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2015-04-30 12:23:45 +0200 |
| commit | a5c6199d194b47c4385083d5aca35807c50c1549 (patch) | |
| tree | c7edf5193895d6252e3dbd61ee48746d0de2b942 /lib/edoc/src/edoc_lib.erl | |
| parent | 147e8b9bd0b36315f0d8bd38e39c51d93cd9f509 (diff) | |
| parent | a1f9b09e47dfa56957c36b39d3d3e541c7cd9d19 (diff) | |
| download | otp-a5c6199d194b47c4385083d5aca35807c50c1549.tar.gz otp-a5c6199d194b47c4385083d5aca35807c50c1549.tar.bz2 otp-a5c6199d194b47c4385083d5aca35807c50c1549.zip | |
Merge branch 'hb/line_abstraction/OTP-12195'
* hb/line_abstraction/OTP-12195: (21 commits)
Ensure that erl_anno is used when building the primary bootstrap
erl_docgen: Use module erl_anno
wx: Use module erl_anno
diameter: Use module erl_anno
dialyzer: Use module erl_anno
eunit: Use module erl_anno
hipe: Use module erl_anno
edoc: Use module erl_anno
syntax_tools: Use module erl_anno
test_server: Use module erl_anno
tools: Use module erl_anno
parsetools: Use module erl_anno
kernel: Use module erl_anno
asn1: Use module erl_anno
debugger: Use module erl_anno
stdlib: Silence some of qlc's warnings
stdlib: Use module erl_anno
compiler: Use module erl_anno
emulator: Use module erl_anno
Update primary bootstrap
...
Diffstat (limited to 'lib/edoc/src/edoc_lib.erl')
| -rw-r--r-- | lib/edoc/src/edoc_lib.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/edoc/src/edoc_lib.erl b/lib/edoc/src/edoc_lib.erl index c248964dc4..dcc239f6b4 100644 --- a/lib/edoc/src/edoc_lib.erl +++ b/lib/edoc/src/edoc_lib.erl @@ -1012,7 +1012,7 @@ get_plugin(Key, Default, Opts) -> %% --------------------------------------------------------------------- %% Error handling --type line() :: erl_scan:line(). +-type line() :: erl_anno:line(). -type err() :: 'eof' | {'missing', char()} | {line(), atom(), string()} |