---

yaml
---
r: 75751
b: refs/heads/master
c: 369f7fa
h: refs/heads/master
i:
  75749: 85aaea0
  75747: d71d61d
  75743: 5ba28a0
v: v3

Author: bblum

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 67c954e365970e4c2cd06f0c50724656d7010f45
+refs/heads/master: 369f7fa169d9f97ac8185105201182781076a90d
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 67c954e365970e4c2cd06f0c50724656d7010f45
 refs/heads/try: 10089455287dcc3652b984ab4bfd6971e1b5f302

trunk/src/librustc/middle/lang_items.rs

@@ -158,6 +158,12 @@ impl LanguageItems {
         }
     }
 
+    pub fn is_builtin_kind(&self, id: def_id) -> bool {
+        Some(id) == self.freeze_trait() ||
+        Some(id) == self.send_trait() ||
+        Some(id) == self.sized_trait()
+    }
+
     pub fn freeze_trait(&self) -> Option<def_id> {
         self.items[FreezeTraitLangItem as uint]
     }

trunk/src/librustc/middle/ty.rs

@@ -3725,6 +3725,12 @@ pub fn impl_trait_ref(cx: ctxt, id: ast::def_id) -> Option<@TraitRef> {
     return ret;
 }
 
+pub fn trait_ref_is_builtin_kind(tcx: ctxt, tr: &ast::trait_ref) -> bool {
+    let def = tcx.def_map.find(&tr.ref_id).expect("no def-map entry for trait");
+    let def_id = ast_util::def_id_of_def(*def);
+    tcx.lang_items.is_builtin_kind(def_id)
+}
+
 pub fn ty_to_def_id(ty: t) -> Option<ast::def_id> {
     match get(ty).sty {
       ty_trait(id, _, _, _, _) | ty_struct(id, _) | ty_enum(id, _) => Some(id),

trunk/src/librustc/middle/typeck/collect.rs

@@ -869,6 +869,13 @@ pub fn convert(ccx: &CrateCtxt, it: &ast::item) {
                                   &i_ty_generics, generics,
                                   parent_visibility);
         for t in opt_trait_ref.iter() {
+            // Prevent the builtin kind traits from being manually implemented.
+            if ty::trait_ref_is_builtin_kind(ccx.tcx, t) {
+                ccx.tcx.sess.span_err(it.span,
+                    "cannot provide an explicit implementation \
+                     for a builtin kind");
+            }
+
             check_methods_against_trait(ccx, generics, rp, selfty, t, cms);
         }
       }

trunk/src/libstd/rt/rtio.rs

@@ -24,25 +24,22 @@ pub type RtioTcpStreamObject = uvio::UvTcpStream;
 pub type RtioTcpListenerObject = uvio::UvTcpListener;
 pub type RtioUdpSocketObject = uvio::UvUdpSocket;
 pub type RtioTimerObject = uvio::UvTimer;
-pub type PausibleIdleCallback = uvio::UvPausibleIdleCallback;
 
 pub trait EventLoop {
     fn run(&mut self);
     fn callback(&mut self, ~fn());
-    fn pausible_idle_callback(&mut self) -> ~PausibleIdleCallback;
     fn callback_ms(&mut self, ms: u64, ~fn());
     fn remote_callback(&mut self, ~fn()) -> ~RemoteCallbackObject;
     /// The asynchronous I/O services. Not all event loops may provide one
     fn io<'a>(&'a mut self) -> Option<&'a mut IoFactoryObject>;
 }
 
 pub trait RemoteCallback {
-    /// Trigger the remote callback. Note that the number of times the
-    /// callback is run is not guaranteed. All that is guaranteed is
-    /// that, after calling 'fire', the callback will be called at
-    /// least once, but multiple callbacks may be coalesced and
-    /// callbacks may be called more often requested. Destruction also
-    /// triggers the callback.
+    /// Trigger the remote callback. Note that the number of times the callback
+    /// is run is not guaranteed. All that is guaranteed is that, after calling 'fire',
+    /// the callback will be called at least once, but multiple callbacks may be coalesced
+    /// and callbacks may be called more often requested. Destruction also triggers the
+    /// callback.
     fn fire(&mut self);
 }