From 036b26a19747692e48a907459acbb0a7ce321bec Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Thu, 13 Dec 2012 16:17:28 -0800 Subject: [PATCH] librustc: Remove merge markers. rs=oops --- src/librustc/middle/ty.rs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs index be9e328f681e..69a86a3e4edb 100644 --- a/src/librustc/middle/ty.rs +++ b/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) =>