---

yaml
---
r: 147434
b: refs/heads/try2
c: 41cbbb6
h: refs/heads/master
v: v3

Author: olsonjeffery

[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: e09a8e892346ddcb917b74f0c5c678a5b477f609
+refs/heads/try2: 41cbbb656a9d29305fd03fb09d261cbfa0766f7a
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/etc/combine-tests.py

@@ -46,6 +46,7 @@ def scrub(b):
 // AUTO-GENERATED FILE: DO NOT EDIT
 #[crate_id=\"run_pass_stage2#0.1\"];
 #[pkgid=\"run_pass_stage2#0.1\"];
+#[link(name=\"run_pass_stage2\", vers=\"0.1\")];
 #[feature(globs, macro_rules, struct_variant, managed_boxes)];
 #[allow(warnings)];
 """

branches/try2/src/libextra/uuid.rs

@@ -65,6 +65,7 @@ use std::rand;
 use std::rand::Rng;
 use std::cmp::Eq;
 use std::cast::{transmute,transmute_copy};
+use std::to_bytes::{IterBytes, Cb};
 
 use serialize::{Encoder, Encodable, Decoder, Decodable};
 
@@ -104,6 +105,11 @@ pub struct Uuid {
     /// The 128-bit number stored in 16 bytes
     bytes: UuidBytes
 }
+impl IterBytes for Uuid {
+    fn iter_bytes(&self, _: bool, f: Cb) -> bool {
+        f(self.bytes.slice_from(0))
+    }
+}
 
 /// A UUID stored as fields (identical to UUID, used only for conversions)
 struct UuidFields {
@@ -796,6 +802,17 @@ mod test {
         let u2 = Decodable::decode(&mut ebml::reader::Decoder(doc));
         assert_eq!(u, u2);
     }
+
+    #[test]
+    fn test_iterbytes_impl_for_uuid() {
+        use std::hashmap::HashSet;
+        let mut set = HashSet::new();
+        let id1 = Uuid::new_v4();
+        let id2 = Uuid::new_v4();
+        set.insert(id1);
+        assert!(set.contains(&id1));
+        assert!(!set.contains(&id2));
+    }
 }
 
 #[cfg(test)]

branches/try2/src/librustc/middle/lint.rs

@@ -872,12 +872,6 @@ fn check_crate_attrs_usage(cx: &Context, attrs: &[ast::Attribute]) {
         if !iter.any(|other_attr| { name.equiv(other_attr) }) {
             cx.span_lint(attribute_usage, attr.span, "unknown crate attribute");
         }
-        if name.equiv(& &"link") {
-            cx.tcx.sess.span_err(attr.span,
-                                 "obsolete crate `link` attribute");
-            cx.tcx.sess.note("the link attribute has been superceded by the crate_id \
-                             attribute, which has the format `#[crate_id = \"name#version\"]`");
-        }
     }
 }
 

branches/try2/src/test/auxiliary/cci_impl_lib.rs

@@ -9,6 +9,8 @@
 // except according to those terms.
 
 #[crate_id="cci_impl_lib"];
+// NOTE: remove after the next snapshot
+#[link(name="cci_impl_lib", vers="0.0")];
 
 trait uint_helpers {
     fn to(&self, v: uint, f: |uint|);

branches/try2/src/test/auxiliary/cci_iter_lib.rs

@@ -9,6 +9,8 @@
 // except according to those terms.
 
 #[crate_id="cci_iter_lib"];
+// NOTE: remove after the next snapshot
+#[link(name="cci_iter_lib", vers="0.0")];
 
 #[inline]
 pub fn iter<T>(v: &[T], f: |&T|) {

branches/try2/src/test/auxiliary/cci_no_inline_lib.rs

@@ -9,6 +9,8 @@
 // except according to those terms.
 
 #[crate_id="cci_no_inline_lib"];
+// NOTE: remove after the next snapshot
+#[link(name="cci_no_inline_lib", vers="0.0")];
 
 // same as cci_iter_lib, more-or-less, but not marked inline
 pub fn iter(v: ~[uint], f: |uint|) {

branches/try2/src/test/auxiliary/crate-method-reexport-grrrrrrr2.rs

@@ -10,6 +10,8 @@
 
 #[feature(managed_boxes)];
 #[crate_id="crate_method_reexport_grrrrrrr2"];
+// NOTE: remove after the next snapshot
+#[link(name = "crate_method_reexport_grrrrrrr2")];
 
 pub use name_pool::add;
 

branches/try2/src/test/auxiliary/crateresolve1-1.rs

@@ -9,6 +9,9 @@
 // except according to those terms.
 
 #[crate_id="crateresolve1#0.1"];
+// NOTE: remove after the next snapshot
+#[link(name = "crateresolve1",
+       vers = "0.1")];
 
 #[crate_type = "lib"];
 

branches/try2/src/test/auxiliary/crateresolve1-2.rs

@@ -9,6 +9,9 @@
 // except according to those terms.
 
 #[crate_id="crateresolve1#0.2"];
+// NOTE: remove after the next snapshot
+#[link(name = "crateresolve1",
+       vers = "0.2")];
 
 #[crate_type = "lib"];
 

branches/try2/src/test/auxiliary/crateresolve1-3.rs

@@ -9,6 +9,9 @@
 // except according to those terms.
 
 #[crate_id="crateresolve1#0.3"];
+// NOTE: remove after the next snapshot
+#[link(name = "crateresolve1",
+       vers = "0.3")];
 
 #[crate_type = "lib"];
 

branches/try2/src/test/auxiliary/crateresolve2-1.rs

@@ -9,6 +9,9 @@
 // except according to those terms.
 
 #[crate_id="crateresolve2#0.1"];
+// NOTE: remove after the next snapshot
+#[link(name = "crateresolve2",
+       vers = "0.1")];
 
 #[crate_type = "lib"];
 

branches/try2/src/test/auxiliary/crateresolve2-2.rs

@@ -9,6 +9,9 @@
 // except according to those terms.
 
 #[crate_id="crateresolve2#0.2"];
+// NOTE: remove after the next snapshot
+#[link(name = "crateresolve2",
+       vers = "0.2")];
 
 #[crate_type = "lib"];
 

branches/try2/src/test/auxiliary/crateresolve2-3.rs

@@ -9,6 +9,9 @@
 // except according to those terms.
 
 #[crate_id="crateresolve2#0.3"];
+// NOTE: remove after the next snapshot
+#[link(name = "crateresolve2",
+       vers = "0.3")];
 
 #[crate_type = "lib"];
 

branches/try2/src/test/auxiliary/crateresolve3-1.rs

@@ -9,6 +9,9 @@
 // except according to those terms.
 
 #[crate_id="crateresolve3#0.1"];
+// NOTE: remove after the next snapshot
+#[link(name = "crateresolve3",
+       vers = "0.1")];
 
 #[crate_type = "lib"];
 

branches/try2/src/test/auxiliary/crateresolve3-2.rs

@@ -9,6 +9,9 @@
 // except according to those terms.
 
 #[crate_id="crateresolve3#0.2"];
+// NOTE: remove after the next snapshot
+#[link(name = "crateresolve3",
+       vers = "0.2")];
 
 #[crate_type = "lib"];
 

branches/try2/src/test/auxiliary/crateresolve4a-1.rs

@@ -9,6 +9,8 @@
 // except according to those terms.
 
 #[crate_id="crateresolve4a#0.1"];
+// NOTE: remove after the next snapshot
+#[link(name = "crateresolve4a", vers = "0.1")];
 #[crate_type = "lib"];
 
 pub fn f() -> int { 10 }

branches/try2/src/test/auxiliary/crateresolve4a-2.rs

@@ -9,6 +9,8 @@
 // except according to those terms.
 
 #[crate_id="crateresolve4a#0.2"];
+// NOTE: remove after the next snapshot
+#[link(name = "crateresolve4a", vers= "0.2")];
 #[crate_type = "lib"];
 
 pub fn g() -> int { 20 }

branches/try2/src/test/auxiliary/crateresolve4b-1.rs

@@ -11,6 +11,8 @@
 // aux-build:crateresolve4a-1.rs
 // aux-build:crateresolve4a-2.rs
 #[crate_id="crateresolve4b#0.1"];
+// NOTE: remove after the next snapshot
+#[link(name = "crateresolve4b", vers = "0.1")];
 #[crate_type = "lib"];
 
 extern mod crateresolve4a = "crateresolve4a#0.2";

branches/try2/src/test/auxiliary/crateresolve4b-2.rs

@@ -11,6 +11,8 @@
 // aux-build:crateresolve4a-1.rs
 // aux-build:crateresolve4a-2.rs
 #[crate_id="crateresolve4b#0.2"];
+// NOTE: remove after the next snapshot
+#[link(name = "crateresolve4b", vers = "0.2")];
 #[crate_type = "lib"];
 
 extern mod crateresolve4a = "crateresolve4a#0.1";

branches/try2/src/test/auxiliary/crateresolve5-1.rs

@@ -9,6 +9,9 @@
 // except according to those terms.
 
 #[crate_id="crateresolve5#0.1"];
+// NOTE: remove after the next snapshot
+#[link(name = "crateresolve5",
+       vers = "0.1")];
 
 #[crate_type = "lib"];
 

branches/try2/src/test/auxiliary/crateresolve5-2.rs

@@ -9,6 +9,9 @@
 // except according to those terms.
 
 #[crate_id="crateresolve5#0.2"];
+// NOTE: remove after the next snapshot
+#[link(name = "crateresolve5",
+       vers = "0.2")];
 
 #[crate_type = "lib"];
 

branches/try2/src/test/auxiliary/crateresolve8-1.rs

@@ -10,6 +10,9 @@
 
 // default link meta for 'package_id' will be equal to filestem
 #[crate_id="crateresolve8#0.1"];
+// NOTE: remove after the next snapshot
+#[link(name = "crateresolve8",
+       vers = "0.1")];
 
 #[crate_type = "lib"];
 

branches/try2/src/test/auxiliary/extern-crosscrate-source.rs

@@ -9,6 +9,10 @@
 // except according to those terms.
 
 #[crate_id="externcallback#0.1"];
+// NOTE: remove after the next snapshot
+#[link(name = "externcallback",
+       vers = "0.1")];
+
 #[crate_type = "lib"];
 
 use std::libc;

branches/try2/src/test/auxiliary/foreign_lib.rs

@@ -9,6 +9,8 @@
 // except according to those terms.
 
 #[crate_id="foreign_lib"];
+// NOTE: remove after the next snapshot
+#[link(name="foreign_lib", vers="0.0")];
 
 pub mod rustrt {
     use std::libc;

branches/try2/src/test/auxiliary/inline_dtor.rs

@@ -9,6 +9,8 @@
 // except according to those terms.
 
 #[crate_id="inline_dtor#0.1"];
+// NOTE: remove after the next snapshot
+#[link(name="inline_dtor", vers="0.1")];
 
 pub struct Foo;
 

branches/try2/src/test/auxiliary/iss.rs

@@ -9,6 +9,8 @@
 // except according to those terms.
 
 #[crate_id="issue6919_3#0.1"];
+// NOTE: remove after the next snapshot
+#[link(name="iss6919_3", vers="0.1")];
 
 // part of issue-6919.rs
 

branches/try2/src/test/auxiliary/issue-2380.rs

@@ -10,6 +10,8 @@
 
 #[feature(managed_boxes)];
 #[crate_id="a"];
+// NOTE: remove after the next snapshot
+#[link(name = "a", vers = "0.0")];
 #[crate_type = "lib"];
 
 pub trait i<T> { }

branches/try2/src/test/auxiliary/issue-2414-a.rs

@@ -9,6 +9,8 @@
 // except according to those terms.
 
 #[crate_id="a#0.1"];
+// NOTE: remove after the next snapshot
+#[link(name = "a", vers = "0.1")];
 #[crate_type = "lib"];
 
 type t1 = uint;

branches/try2/src/test/auxiliary/issue-2414-b.rs

@@ -11,6 +11,8 @@
 // xfail-fast
 
 #[crate_id="b#0.1"];
+// NOTE: remove after the next snapshot
+#[link(name = "b", vers = "0.1")];
 #[crate_type = "lib"];
 
 extern mod a;

branches/try2/src/test/auxiliary/issue-2526.rs

@@ -9,6 +9,10 @@
 // except according to those terms.
 
 #[crate_id="issue_2526#0.2"];
+// NOTE: remove after the next snapshot
+#[link(name = "issue_2526",
+       vers = "0.2",
+       uuid = "54cc1bc9-02b8-447c-a227-75ebc923bc29")];
 #[crate_type = "lib"];
 
 extern mod extra;

branches/try2/src/test/auxiliary/issue-2631-a.rs

@@ -10,6 +10,8 @@
 
 #[feature(managed_boxes)];
 #[crate_id="req"];
+// NOTE: remove after the next snapshot
+#[link(name = "req")];
 #[crate_type = "lib"];
 
 extern mod extra;

branches/try2/src/test/auxiliary/issue-3012-1.rs

@@ -9,6 +9,8 @@
 // except according to those terms.
 
 #[crate_id="socketlib"];
+// NOTE: remove after the next snapshot
+#[link(name="socketlib", vers="0.0")];
 #[crate_type = "lib"];
 
 pub mod socket {

branches/try2/src/test/auxiliary/issue-4208-cc.rs

@@ -9,6 +9,9 @@
 // except according to those terms.
 
 #[crate_id="numeric#0.1"];
+// NOTE: remove after the next snapshot
+#[link(name = "numeric",
+       vers = "0.1")];
 #[crate_type = "lib"];
 
 pub trait Trig<T> {

branches/try2/src/test/auxiliary/issue2378a.rs

@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[link (name = "issue2378a")];
 #[crate_type = "lib"];
 
 pub enum maybe<T> { just(T), nothing }

branches/try2/src/test/auxiliary/issue2378b.rs

@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[link (name = "issue2378b")];
 #[crate_type = "lib"];
 
 extern mod issue2378a;

branches/try2/src/test/auxiliary/issue_2242_a.rs

@@ -9,6 +9,8 @@
 // except according to those terms.
 
 #[crate_id="a#0.1"];
+// NOTE: remove after the next snapshot
+#[link(name = "a", vers = "0.1")];
 #[crate_type = "lib"];
 
 trait to_strz {

branches/try2/src/test/auxiliary/issue_2242_c.rs

@@ -9,6 +9,8 @@
 // except according to those terms.
 
 #[crate_id="c#0.1"];
+// NOTE: remove after the next snapshot
+#[link(name = "c", vers = "0.1")];
 #[crate_type = "lib"];
 
 extern mod a;

branches/try2/src/test/auxiliary/issue_3979_traits.rs

@@ -9,6 +9,9 @@
 // except according to those terms.
 
 #[crate_id="issue_3979_traits#0.1"];
+// NOTE: remove after the next snapshot
+#[link(name = "issue_3979_traits",
+       vers = "0.1")];
 
 #[crate_type = "lib"];