diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index 3cb5c663c4ea5..650cd749af69e 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -429,17 +429,11 @@ impl attr::AttrMetaMethods for Attribute { } } fn meta_item_list<'a>(&'a self) -> Option<&'a [@ast::MetaItem]> { None } - fn name_str_pair(&self) -> Option<(InternedString, InternedString)> { - None - } } impl<'a> attr::AttrMetaMethods for &'a Attribute { fn name(&self) -> InternedString { (**self).name() } fn value_str(&self) -> Option { (**self).value_str() } fn meta_item_list<'a>(&'a self) -> Option<&'a [@ast::MetaItem]> { None } - fn name_str_pair(&self) -> Option<(InternedString, InternedString)> { - None - } } #[deriving(Clone, Encodable, Decodable)] diff --git a/src/libsyntax/attr.rs b/src/libsyntax/attr.rs index a8f30c0514b80..6005513af110d 100644 --- a/src/libsyntax/attr.rs +++ b/src/libsyntax/attr.rs @@ -53,12 +53,6 @@ pub trait AttrMetaMethods { fn value_str(&self) -> Option; /// Gets a list of inner meta items from a list MetaItem type. fn meta_item_list<'a>(&'a self) -> Option<&'a [@MetaItem]>; - - /** - * If the meta item is a name-value type with a string value then returns - * a tuple containing the name and string value, otherwise `None` - */ - fn name_str_pair(&self) -> Option<(InternedString,InternedString)>; } impl AttrMetaMethods for Attribute { @@ -76,9 +70,6 @@ impl AttrMetaMethods for Attribute { fn meta_item_list<'a>(&'a self) -> Option<&'a [@MetaItem]> { self.node.value.meta_item_list() } - fn name_str_pair(&self) -> Option<(InternedString,InternedString)> { - self.meta().name_str_pair() - } } impl AttrMetaMethods for MetaItem { @@ -108,10 +99,6 @@ impl AttrMetaMethods for MetaItem { _ => None } } - - fn name_str_pair(&self) -> Option<(InternedString,InternedString)> { - self.value_str().map(|s| (self.name(), s)) - } } // Annoying, but required to get test_cfg to work @@ -121,9 +108,6 @@ impl AttrMetaMethods for @MetaItem { fn meta_item_list<'a>(&'a self) -> Option<&'a [@MetaItem]> { (**self).meta_item_list() } - fn name_str_pair(&self) -> Option<(InternedString,InternedString)> { - (**self).name_str_pair() - } }