File tree Expand file tree Collapse file tree 2 files changed +5
-4
lines changed
branches/snap-stage3/src/libsyntax/parse Expand file tree Collapse file tree 2 files changed +5
-4
lines changed Original file line number Diff line number Diff line change 1
1
---
2
2
refs/heads/master: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
3
3
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4
- refs/heads/snap-stage3: 1abc1be81ad47ed97f37ca98429156e4392df12c
4
+ refs/heads/snap-stage3: d2aee7b3e68c33edc410485f7ccadba1484c3bc3
5
5
refs/heads/try: 8eb2bab100b42f0ba751552d8eff00eb2134c55a
6
6
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
7
7
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
Original file line number Diff line number Diff line change @@ -367,7 +367,7 @@ pub impl Parser {
367
367
368
368
let opt_abis = self . parse_opt_abis ( ) ;
369
369
let abis = opt_abis. get_or_default ( AbiSet :: Rust ( ) ) ;
370
- let purity = self . parse_purity ( ) ;
370
+ let purity = self . parse_unsafety ( ) ;
371
371
self . expect_keyword ( & ~"fn ") ;
372
372
let ( decl, lifetimes) = self . parse_ty_fn_decl ( ) ;
373
373
return ty_bare_fn ( @TyBareFn {
@@ -401,7 +401,7 @@ pub impl Parser {
401
401
// At this point, the allocation type and lifetime bound have been
402
402
// parsed.
403
403
404
- let purity = self . parse_purity ( ) ;
404
+ let purity = self . parse_unsafety ( ) ;
405
405
let onceness = parse_onceness ( self ) ;
406
406
self . expect_keyword ( & ~"fn ") ;
407
407
@@ -426,7 +426,8 @@ pub impl Parser {
426
426
}
427
427
}
428
428
429
- fn parse_purity ( & self ) -> purity {
429
+ // looks like this should be called parse_unsafety
430
+ fn parse_unsafety ( & self ) -> purity {
430
431
if self . eat_keyword ( & ~"pure") {
431
432
self . obsolete ( * self . last_span , ObsoletePurity ) ;
432
433
return impure_fn;
You can’t perform that action at this time.
0 commit comments