Fix fn decl rewriting in case of generics

An opening paren in generics caused a false-positive detection of args
beginning. The result was the creation of comments with some code into
it.

1 files changed, 9 insertions, 1 deletions

diff --git a/src/utils.rs b/src/utils.rs
index de17f989f7a..47203a0754f 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use syntax::ast::{Visibility, Attribute, MetaItem, MetaItem_};
+use syntax::ast::{self, Visibility, Attribute, MetaItem, MetaItem_};
 use syntax::codemap::{CodeMap, Span, BytePos};
 
 use comment::FindUncommented;
@@ -72,6 +72,14 @@ pub fn contains_skip(attrs: &[Attribute]) -> bool {
     attrs.iter().any(|a| is_skip(&a.node.value))
 }
 
+// Find the end of a TyParam
+pub fn end_typaram(typaram: &ast::TyParam) -> BytePos {
+    typaram.bounds.last().map(|bound| match *bound {
+        ast::RegionTyParamBound(ref lt) => lt.span,
+        ast::TraitTyParamBound(ref prt, _) => prt.span,
+    }).unwrap_or(typaram.span).hi
+}
+
 #[inline]
 #[cfg(target_pointer_width="64")]
 // Based on the trick layed out at