---

yaml
---
r: 16297
b: refs/heads/try
c: ee8c762
h: refs/heads/master
i:
  16295: 967eb82
v: v3

Author: catamorphism

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: be83a12ff7bcc9c620bab8297654f6e006b50d6d
+refs/heads/try: ee8c762bdebb9800e768762e8f7d36a44b65f167
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/libcore/core.rc

@@ -43,7 +43,6 @@ export comm, task, future;
 export extfmt;
 export tuple;
 export to_str;
-export swappable;
 export dvec, dvec_iter;
 
 // NDM seems to be necessary for resolve to work
@@ -164,7 +163,6 @@ mod option_iter {
 }
 mod result;
 mod to_str;
-mod swappable;
 mod dvec;
 #[path="iter-trait"]
 mod dvec_iter {

branches/try/src/libcore/swappable.rs

@@ -637,11 +637,6 @@ fn link_binary(sess: session,
     // and binutils 2.22+ won't add them automatically
     if sess.targ_cfg.os == session::os_linux {
         cc_args += ["-lrt", "-ldl"];
-
-        // LLVM implements the `frem` instruction as a call to `fmod`,
-        // which lives in libm. Similar to above, on some linuxes we
-        // have to be explicit about linking to it. See #2510
-        cc_args += ["-lm"];
     }
 
     if sess.targ_cfg.os == session::os_freebsd {

branches/try/src/rustc/back/link.rs

@@ -1678,11 +1678,8 @@ fn is_instantiable(cx: ctxt, r_ty: t) -> bool {
 
           ty_class(did, substs) {
             vec::push(*seen, did);
-            let r = vec::any(lookup_class_fields(cx, did)) {|f|
-                let fty = ty::lookup_item_type(cx, f.id);
-                let sty = subst(cx, substs, fty.ty);
-                type_requires(cx, seen, r_ty, sty)
-            };
+            let r = vec::any(class_items_as_fields(cx, did, substs)) {|f|
+                      type_requires(cx, seen, r_ty, f.mt.ty)};
             vec::pop(*seen);
             r
           }

branches/try/src/rustc/middle/ty.rs

@@ -1,11 +1,3 @@
-S 2012-06-05 fec3b91
-  winnt-i386 36348a2b016f25d9e3b7e1a8814a352c18123839
-  linux-x86_64 7308f0eb3d6a9985c14dfbbde7e1f9eb901cc966
-  linux-i386 d4c1e1733fd30945f96ae67dbc10289f2a9ec380
-  freebsd-x86_64 d0ee6054d7d8320d64aa4dbb9b041537fa2665d5
-  macos-x86_64 652501172b4fee6631f595c90538fd95914ef444
-  macos-i386 5c54b5ecf54cc2631fdd48caa326ab44b5a2e494
-
 S 2012-06-04 7213274
   winnt-i386 94b9414433fd83c086b349ded3159f0541aace16
   linux-x86_64 eb9cf0de4cc09e8b8bfcf741eff4b20510e13a5b