Skip to content

Commit 574e891

Browse files
committed
---
yaml --- r: 55101 b: refs/heads/snap-stage3 c: d2aee7b h: refs/heads/master i: 55099: 8bab210 v: v3
1 parent 3ffa87f commit 574e891

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 1abc1be81ad47ed97f37ca98429156e4392df12c
4+
refs/heads/snap-stage3: d2aee7b3e68c33edc410485f7ccadba1484c3bc3
55
refs/heads/try: 8eb2bab100b42f0ba751552d8eff00eb2134c55a
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libsyntax/parse/parser.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ pub impl Parser {
367367

368368
let opt_abis = self.parse_opt_abis();
369369
let abis = opt_abis.get_or_default(AbiSet::Rust());
370-
let purity = self.parse_purity();
370+
let purity = self.parse_unsafety();
371371
self.expect_keyword(&~"fn");
372372
let (decl, lifetimes) = self.parse_ty_fn_decl();
373373
return ty_bare_fn(@TyBareFn {
@@ -401,7 +401,7 @@ pub impl Parser {
401401
// At this point, the allocation type and lifetime bound have been
402402
// parsed.
403403

404-
let purity = self.parse_purity();
404+
let purity = self.parse_unsafety();
405405
let onceness = parse_onceness(self);
406406
self.expect_keyword(&~"fn");
407407

@@ -426,7 +426,8 @@ pub impl Parser {
426426
}
427427
}
428428

429-
fn parse_purity(&self) -> purity {
429+
// looks like this should be called parse_unsafety
430+
fn parse_unsafety(&self) -> purity {
430431
if self.eat_keyword(&~"pure") {
431432
self.obsolete(*self.last_span, ObsoletePurity);
432433
return impure_fn;

0 commit comments

Comments
 (0)