summaryrefslogtreecommitdiff
path: root/tools/common/toml.cpp
diff options
context:
space:
mode:
authorJohn Hodge <tpg@ucc.asn.au>2019-11-02 11:07:23 +0800
committerJohn Hodge <tpg@ucc.asn.au>2019-11-02 11:07:23 +0800
commit1d02810c3cf908bfba7c15ae50eb5314603b9d85 (patch)
tree79dd5e4ef4c3ff79db0912ba546f08e61a7a8c10 /tools/common/toml.cpp
parent7111acba04d72fe4084b1a1f3209ff83efe8614d (diff)
parent8b53b38f40625ab0510f541d69db3f83332a830a (diff)
downloadmrust-1d02810c3cf908bfba7c15ae50eb5314603b9d85.tar.gz
Merge branch 'nightly-1.29' - #95 Working support for rustc 1.29
Diffstat (limited to 'tools/common/toml.cpp')
-rw-r--r--tools/common/toml.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/common/toml.cpp b/tools/common/toml.cpp
index 285d22a4..4e8e6da6 100644
--- a/tools/common/toml.cpp
+++ b/tools/common/toml.cpp
@@ -264,8 +264,7 @@ TomlKeyValue TomlFile::get_next_value()
}
if( m_current_composite.empty() )
{
- // TODO: Allow EOF?
- if(t.m_type != Token::Type::Newline)
+ if(t.m_type != Token::Type::Newline && t.m_type != Token::Type::Eof)
throw ::std::runtime_error(::format(m_lexer, ": Unexpected token in TOML file after entry - ", t));
}
else