---

bors · bors · commit a690373d38b8 · 2014-03-28T06:26:47.000-07:00
yaml --- r: 150353 b: refs/heads/try2 c: b8601a3 h: refs/heads/master i: 150351: 65baa95 v: v3
diff --git a/[refs] b/[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: 81ec1f3c186cd64450d8141aab467f0a1f3a7ebd
+refs/heads/try2: b8601a3d8b91ad3b653d143307611f2f5c75617e
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try2/src/librustdoc/html/layout.rs b/branches/try2/src/librustdoc/html/layout.rs
@@ -39,7 +39,7 @@ r##"<!DOCTYPE html>
           rel='stylesheet' type='text/css'>
     <link rel="stylesheet" type="text/css" href="{root_path}main.css">
 
-    {favicon, select, none{} other{<link rel="shortcut icon" href="\#" />}}
+    {favicon, select, none{} other{<link rel="shortcut icon" href="#" />}}
 </head>
 <body>
     <!--[if lte IE 8]>
@@ -51,7 +51,7 @@ r##"<!DOCTYPE html>
 
     <section class="sidebar">
         {logo, select, none{} other{
-            <a href='{root_path}{krate}/index.html'><img src='\#' alt=''/></a>
+            <a href='{root_path}{krate}/index.html'><img src='#' alt=''/></a>
         }}
 
         {sidebar}
diff --git a/branches/try2/src/libstd/intrinsics.rs b/branches/try2/src/libstd/intrinsics.rs
@@ -451,7 +451,7 @@ extern "rust-intrinsic" {
 /// `TypeId` represents a globally unique identifier for a type
 #[lang="type_id"] // This needs to be kept in lockstep with the code in trans/intrinsic.rs and
                   // middle/lang_items.rs
-#[deriving(Eq, Hash, Show)]
+#[deriving(Eq, Hash, Show, TotalEq)]
 #[cfg(not(test))]
 pub struct TypeId {
     priv t: u64,
