diff options
| author | bors <bors@rust-lang.org> | 2019-07-12 23:37:39 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-07-12 23:37:39 +0000 |
| commit | e13fe7ff5e482b626714ac6ec41b8d44e7c22ed1 (patch) | |
| tree | a060f5b049425798bdf7dc8470ae34c4e7e5b22b /src/libsyntax/util/parser_testing.rs | |
| parent | 71f9384e3bec467158a628e2d11e77ffada16a90 (diff) | |
| parent | fe4e32a4e655846976475ef0a7dc5837eab796fe (diff) | |
| download | rust-e13fe7ff5e482b626714ac6ec41b8d44e7c22ed1.tar.gz rust-e13fe7ff5e482b626714ac6ec41b8d44e7c22ed1.zip | |
Auto merge of #62635 - Centril:rollup-potvfnk, r=Centril
Rollup of 12 pull requests Successful merges: - #61535 (Coherence test when a generic type param has a default value from an associated type) - #62274 (rustc_mir: follow FalseUnwind's real_target edge in qualify_consts.) - #62431 (Add messages to `Option`'s and `Result`'s `must_use` annotation for `is_*`) - #62453 (in which we suggest anonymizing single-use lifetimes in paths ) - #62568 (Replace unsafe_destructor_blind_to_params with may_dangle) - #62578 (Add test for #49919) - #62595 (Document that the crate keyword refers to the project root) - #62599 (move mem::uninitialized deprecation back by 1 release, to 1.39) - #62605 (Emit dropped unemitted errors to aid in ICE debugging) - #62607 (Correctly break out of recovery loop) - #62608 (`async unsafe fn` tests) - #62623 (downgrade indirect_structural_match lint to allow) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax/util/parser_testing.rs')
| -rw-r--r-- | src/libsyntax/util/parser_testing.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/util/parser_testing.rs b/src/libsyntax/util/parser_testing.rs index f850960624c..2ef32d37d44 100644 --- a/src/libsyntax/util/parser_testing.rs +++ b/src/libsyntax/util/parser_testing.rs @@ -34,7 +34,7 @@ fn with_error_checking_parse<'a, T, F>(s: String, ps: &'a ParseSess, f: F) -> T } /// Parse a string, return a crate. -pub fn string_to_crate (source_str : String) -> ast::Crate { +pub fn string_to_crate(source_str : String) -> ast::Crate { let ps = ParseSess::new(FilePathMapping::empty()); with_error_checking_parse(source_str, &ps, |p| { p.parse_crate_mod() @@ -42,7 +42,7 @@ pub fn string_to_crate (source_str : String) -> ast::Crate { } /// Parse a string, return an expr -pub fn string_to_expr (source_str : String) -> P<ast::Expr> { +pub fn string_to_expr(source_str : String) -> P<ast::Expr> { let ps = ParseSess::new(FilePathMapping::empty()); with_error_checking_parse(source_str, &ps, |p| { p.parse_expr() @@ -50,7 +50,7 @@ pub fn string_to_expr (source_str : String) -> P<ast::Expr> { } /// Parse a string, return an item -pub fn string_to_item (source_str : String) -> Option<P<ast::Item>> { +pub fn string_to_item(source_str : String) -> Option<P<ast::Item>> { let ps = ParseSess::new(FilePathMapping::empty()); with_error_checking_parse(source_str, &ps, |p| { p.parse_item() |
