Skip to content

Commit c12eb3b

Browse files
committed
---
yaml --- r: 56507 b: refs/heads/auto c: d2aee7b h: refs/heads/master i: 56505: 6eca633 56503: 40a7805 v: v3
1 parent 14f7da8 commit c12eb3b

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
@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: 1abc1be81ad47ed97f37ca98429156e4392df12c
17+
refs/heads/auto: d2aee7b3e68c33edc410485f7ccadba1484c3bc3
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1919
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/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)