---

yaml
---
r: 144637
b: refs/heads/try2
c: af3cde2
h: refs/heads/master
i:
  144635: 05360c1
v: v3

Author: pnkfelix

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: fc9fa2cb6ca2b0979137134713fe3f693090a9d9
+refs/heads/try2: af3cde2c9760fa3efc061c9e64e17f0aa8b355ff
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/back/link.rs

@@ -607,8 +607,8 @@ pub fn build_link_meta(sess: Session,
     fn crate_meta_name(sess: Session, output: &Path, opt_name: Option<@str>)
         -> @str {
         match opt_name {
-            Some(v) if !v.is_empty() => v,
-            _ => {
+            Some(v) => v,
+            None => {
                 // to_managed could go away if there was a version of
                 // filestem that returned an @str
                 let name = session::expect(sess,
@@ -624,8 +624,8 @@ pub fn build_link_meta(sess: Session,
 
     fn crate_meta_vers(sess: Session, opt_vers: Option<@str>) -> @str {
         match opt_vers {
-            Some(v) if !v.is_empty() => v,
-            _ => {
+            Some(v) => v,
+            None => {
                 let vers = @"0.0";
                 warn_missing(sess, "vers", vers);
                 vers

branches/try2/src/libsyntax/attr.rs

@@ -319,6 +319,7 @@ pub fn require_unique_names(diagnostic: @mut span_handler,
     for meta in metas.iter() {
         let name = meta.name();
 
+        // FIXME: How do I silence the warnings? --pcw (#2619)
         if !set.insert(name) {
             diagnostic.span_fatal(meta.span,
                                   fmt!("duplicate meta item `%s`", name));

branches/try2/src/test/run-pass/trait-bounds-recursion.rs

@@ -0,0 +1,27 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+trait I { fn i(&self) -> Self; }
+
+trait A<T:I> {
+    fn id(x:T) -> T { x.i() }
+}
+
+trait J<T> { fn j(&self) -> Self; }
+
+trait B<T:J<T>> {
+    fn id(x:T) -> T { x.j() }
+}
+
+trait C {
+    fn id<T:J<T>>(x:T) -> T { x.j() }
+}
+
+fn main() { }