---

yaml
---
r: 40798
b: refs/heads/dist-snap
c: 036b26a
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
 refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
-refs/heads/dist-snap: 77982112d35fffb87eaeba3d1db8bd98c754c0d2
+refs/heads/dist-snap: 036b26a19747692e48a907459acbb0a7ce321bec
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/middle/ty.rs

@@ -2140,13 +2140,8 @@ fn type_kind_ext(cx: ctxt, ty: t, allow_ty_var: bool) -> Kind {
         remove_owned(mutable_type_kind(cx, tm) | kind_safe_for_default_mode())
       }
 
-      // Trait instances are (for now) like shared boxes, basically
-<<<<<<< HEAD
-      ty_trait(_, _, _) => kind_safe_for_default_mode() | kind_durable(),
-=======
       // XXX: This is wrong for ~Trait and &Trait!
-      ty_trait(_, _, _) => kind_safe_for_default_mode() | kind_owned(),
->>>>>>> librustc: Have coherence check Copy kind bounds when determining whether parameter substitutions could possibly unify. r=nmatsakis
+      ty_trait(_, _, _) => kind_safe_for_default_mode() | kind_durable(),
 
       // Static region pointers are copyable and sendable, but not owned
       ty_rptr(re_static, mt) =>