auto merge of #19132 : sinistersnare/rust/patch-1, r=alexcrichton

bors · bors · commit 4389ee3893c8 · 2014-11-22T12:46:37.000Z
Just used Githubs edit view, so I hope this works...
diff --git a/src/libsyntax/attr.rs b/src/libsyntax/attr.rs
@@ -47,8 +47,8 @@ pub trait AttrMetaMethods {
         name == self.name().get()
     }
 
-    /// Retrieve the name of the meta item, e.g. foo in #[foo],
-    /// #[foo="bar"] and #[foo(bar)]
+    /// Retrieve the name of the meta item, e.g. `foo` in `#[foo]`,
+    /// `#[foo="bar"]` and `#[foo(bar)]`
     fn name(&self) -> InternedString;
 
     /// Gets the string value if self is a MetaNameValue variant

Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,8 @@ pub trait AttrMetaMethods {`
`47`	`47`	`name == self.name().get()`
`48`	`48`	`}`
`49`	`49`
`50`		`- /// Retrieve the name of the meta item, e.g. foo in #[foo],`
`51`		`- /// #[foo="bar"] and #[foo(bar)]`
	`50`	+ /// Retrieve the name of the meta item, e.g. `foo` in `#[foo]`,
	`51`	+ /// `#[foo="bar"]` and `#[foo(bar)]`
`52`	`52`	`fn name(&self) -> InternedString;`
`53`	`53`
`54`	`54`	`/// Gets the string value if self is a MetaNameValue variant`