diff options
| author | bors <bors@rust-lang.org> | 2016-05-07 12:36:18 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-05-07 12:36:18 -0700 |
| commit | d91f8ab0f58fa123857d96b9e151fc5185f5ff08 (patch) | |
| tree | 4a21bdfb7f514938fb2996d83ac0b97b544464ab /src/libsyntax/parse | |
| parent | 936b32a514b73c1d3dfcbd9d17818f9f18bf4883 (diff) | |
| parent | 84e27738effd0c44f0dc480753fc0affa56fd4a4 (diff) | |
| download | rust-d91f8ab0f58fa123857d96b9e151fc5185f5ff08.tar.gz rust-d91f8ab0f58fa123857d96b9e151fc5185f5ff08.zip | |
Auto merge of #33487 - steveklabnik:rollup, r=steveklabnik
Rollup of 20 pull requests - Successful merges: #33256, #33283, #33313, #33314, #33326, #33336, #33382, #33384, #33402, #33409, #33410, #33412, #33428, #33430, #33437, #33438, #33439, #33442, #33456, #33459 - Failed merges:
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 94e7d0a3939..48368cc025c 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -6013,7 +6013,7 @@ impl<'a> Parser<'a> { // FOREIGN STATIC ITEM return Ok(Some(self.parse_item_foreign_static(visibility, lo, attrs)?)); } - if self.check_keyword(keywords::Fn) || self.check_keyword(keywords::Unsafe) { + if self.check_keyword(keywords::Fn) { // FOREIGN FUNCTION ITEM return Ok(Some(self.parse_item_foreign_fn(visibility, lo, attrs)?)); } |