diff options
| author | bors <bors@rust-lang.org> | 2015-04-06 22:08:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-04-06 22:08:01 +0000 |
| commit | b49a5ef003fedcbb0d78aebda62ba30dfdd17a20 (patch) | |
| tree | d99b438e04f810e098c79b634ed6d730d2dbcb4a /src/libsyntax/util/parser_testing.rs | |
| parent | aab8669ddad0432ef7279cc7f7b0b20d32785314 (diff) | |
| parent | e3427c3c341fcd15cbac783bf8dad7276422c97a (diff) | |
| download | rust-b49a5ef003fedcbb0d78aebda62ba30dfdd17a20.tar.gz rust-b49a5ef003fedcbb0d78aebda62ba30dfdd17a20.zip | |
Auto merge of #23857 - phildawes:libsyntax_nopanic, r=nikomatsakis
Hello! I've been working towards a libsyntax without panics. See: http://internals.rust-lang.org/t/changing-libsyntax-to-use-result-instead-of-panic/1670 This patch changes the internals of parser.rs to use Result<> rather than panicing. It keeps the following old-style panicing functions as a facade: parse_expr, parse_item, parse_pat, parse_arm, parse_ty, parse_stmt I left these functions because I wasn't sure what to do about the quote_* macros or how many syntax-extensions would break if these and quoting macros returned Result. The gyst of the rest of the patch is: - Functions in parse/parser.rs return PResult<> rather than panicing - Other functions in libsyntax call panic! explicitly if they rely on panicing behaviour. - I added a macro 'panictry!()' to act as scaffolding for callers while converting panicing functions. (This does the same as 'unwrap()' but is easier to grep for and turn into try!()). Am I on the right track? I'd quite like to get something merged soon as keeping this rebased in the face of libsyntax changes is a lot of work. Please let me know what changes you'd like to see to make this happen. Thanks!, Phil
Diffstat (limited to 'src/libsyntax/util/parser_testing.rs')
| -rw-r--r-- | src/libsyntax/util/parser_testing.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/util/parser_testing.rs b/src/libsyntax/util/parser_testing.rs index ec608646327..c6646fe93a2 100644 --- a/src/libsyntax/util/parser_testing.rs +++ b/src/libsyntax/util/parser_testing.rs @@ -44,7 +44,7 @@ fn with_error_checking_parse<T, F>(s: String, f: F) -> T where /// Parse a string, return a crate. pub fn string_to_crate (source_str : String) -> ast::Crate { with_error_checking_parse(source_str, |p| { - p.parse_crate_mod() + panictry!(p.parse_crate_mod()) }) } |
