diff options
| author | bors <bors@rust-lang.org> | 2013-09-27 04:51:13 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-09-27 04:51:13 -0700 |
| commit | 74dfd93bad2a2343f330cbea38c702192095210a (patch) | |
| tree | 6e23e4c16c926979443daf47b9bf245da2dd9a51 /src/libsyntax | |
| parent | ae8a2ff37976b069b24bd0558c7af3474dab5854 (diff) | |
| parent | 42bcf638b0213747e01af87353413755b9ebc270 (diff) | |
| download | rust-74dfd93bad2a2343f330cbea38c702192095210a.tar.gz rust-74dfd93bad2a2343f330cbea38c702192095210a.zip | |
auto merge of #9540 : alexcrichton/rust/more-rustdoc-improvements, r=brson
Commit messages have the details, mostly just knocking out more low-hanging-fruit type issues.
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/attr.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libsyntax/attr.rs b/src/libsyntax/attr.rs index 295485d6f6e..47a7d0fbf9e 100644 --- a/src/libsyntax/attr.rs +++ b/src/libsyntax/attr.rs @@ -320,7 +320,7 @@ pub struct Stability { } /// The available stability levels. -#[deriving(Eq,Ord,Clone)] +#[deriving(Eq,Ord,Clone,ToStr)] pub enum StabilityLevel { Deprecated, Experimental, diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index cc5143977cf..6c905c252c1 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -4219,9 +4219,9 @@ impl Parser { } // parse a function declaration from a foreign module - fn parse_item_foreign_fn(&self, attrs: ~[Attribute]) -> @foreign_item { + fn parse_item_foreign_fn(&self, vis: ast::visibility, + attrs: ~[Attribute]) -> @foreign_item { let lo = self.span.lo; - let vis = self.parse_visibility(); // Parse obsolete purity. let purity = self.parse_fn_purity(); @@ -4755,7 +4755,7 @@ impl Parser { if (self.is_keyword(keywords::Fn) || self.is_keyword(keywords::Pure) || self.is_keyword(keywords::Unsafe)) { // FOREIGN FUNCTION ITEM - let item = self.parse_item_foreign_fn(attrs); + let item = self.parse_item_foreign_fn(visibility, attrs); return iovi_foreign_item(item); } self.parse_macro_use_or_failure(attrs,macros_allowed,lo,visibility) |