---

yaml
---
r: 34091
b: refs/heads/snap-stage3
c: 036b26a
h: refs/heads/master
i:
  34089: 55fe9e1
  34087: c0a73e7
v: v3

Author: pcwalton

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 77982112d35fffb87eaeba3d1db8bd98c754c0d2
+refs/heads/snap-stage3: 036b26a19747692e48a907459acbb0a7ce321bec
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/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) =>