Skip to content

Commit b70b6d5

Browse files
committed
---
yaml --- r: 152377 b: refs/heads/try2 c: 9452cd2 h: refs/heads/master i: 152375: a867e19 v: v3
1 parent ef42db6 commit b70b6d5

File tree

3 files changed

+1
-23
lines changed

3 files changed

+1
-23
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 862cd65dcadf34b5ab59063be151ab801fc7bfe1
8+
refs/heads/try2: 9452cd24fb2c0fc68a6d4e18ab44c066a56d9301
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustdoc/clean/mod.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -429,17 +429,11 @@ impl attr::AttrMetaMethods for Attribute {
429429
}
430430
}
431431
fn meta_item_list<'a>(&'a self) -> Option<&'a [@ast::MetaItem]> { None }
432-
fn name_str_pair(&self) -> Option<(InternedString, InternedString)> {
433-
None
434-
}
435432
}
436433
impl<'a> attr::AttrMetaMethods for &'a Attribute {
437434
fn name(&self) -> InternedString { (**self).name() }
438435
fn value_str(&self) -> Option<InternedString> { (**self).value_str() }
439436
fn meta_item_list<'a>(&'a self) -> Option<&'a [@ast::MetaItem]> { None }
440-
fn name_str_pair(&self) -> Option<(InternedString, InternedString)> {
441-
None
442-
}
443437
}
444438

445439
#[deriving(Clone, Encodable, Decodable)]

branches/try2/src/libsyntax/attr.rs

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,6 @@ pub trait AttrMetaMethods {
5353
fn value_str(&self) -> Option<InternedString>;
5454
/// Gets a list of inner meta items from a list MetaItem type.
5555
fn meta_item_list<'a>(&'a self) -> Option<&'a [@MetaItem]>;
56-
57-
/**
58-
* If the meta item is a name-value type with a string value then returns
59-
* a tuple containing the name and string value, otherwise `None`
60-
*/
61-
fn name_str_pair(&self) -> Option<(InternedString,InternedString)>;
6256
}
6357

6458
impl AttrMetaMethods for Attribute {
@@ -76,9 +70,6 @@ impl AttrMetaMethods for Attribute {
7670
fn meta_item_list<'a>(&'a self) -> Option<&'a [@MetaItem]> {
7771
self.node.value.meta_item_list()
7872
}
79-
fn name_str_pair(&self) -> Option<(InternedString,InternedString)> {
80-
self.meta().name_str_pair()
81-
}
8273
}
8374

8475
impl AttrMetaMethods for MetaItem {
@@ -108,10 +99,6 @@ impl AttrMetaMethods for MetaItem {
10899
_ => None
109100
}
110101
}
111-
112-
fn name_str_pair(&self) -> Option<(InternedString,InternedString)> {
113-
self.value_str().map(|s| (self.name(), s))
114-
}
115102
}
116103

117104
// Annoying, but required to get test_cfg to work
@@ -121,9 +108,6 @@ impl AttrMetaMethods for @MetaItem {
121108
fn meta_item_list<'a>(&'a self) -> Option<&'a [@MetaItem]> {
122109
(**self).meta_item_list()
123110
}
124-
fn name_str_pair(&self) -> Option<(InternedString,InternedString)> {
125-
(**self).name_str_pair()
126-
}
127111
}
128112

129113

0 commit comments

Comments
 (0)