From 10bcb60e8f8520c11e34758e290a21534425dee6 Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Thu, 27 Jun 2013 15:07:16 -0700 Subject: [PATCH] librustc: Fix even *MORE* merge fallout! --- src/librustc/middle/lang_items.rs | 4 ++-- src/libstd/os.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/librustc/middle/lang_items.rs b/src/librustc/middle/lang_items.rs index 3418fc649da0..08e55df5b368 100644 --- a/src/librustc/middle/lang_items.rs +++ b/src/librustc/middle/lang_items.rs @@ -295,9 +295,9 @@ impl<'self> LanguageItemCollector<'self> { -> LanguageItemCollector<'a> { let mut item_refs = HashMap::new(); - item_refs.insert(@"const", FreezeTraitLangItem as uint); + item_refs.insert(@"freeze", FreezeTraitLangItem as uint); item_refs.insert(@"copy", CopyTraitLangItem as uint); - item_refs.insert(@"owned", SendTraitLangItem as uint); + item_refs.insert(@"send", SendTraitLangItem as uint); item_refs.insert(@"sized", SizedTraitLangItem as uint); item_refs.insert(@"drop", DropTraitLangItem as uint); diff --git a/src/libstd/os.rs b/src/libstd/os.rs index 590292d0d327..400a93ee28f4 100644 --- a/src/libstd/os.rs +++ b/src/libstd/os.rs @@ -146,7 +146,7 @@ pub mod win32 { pub fn as_utf16_p(s: &str, f: &fn(*u16) -> T) -> T { let mut t = s.to_utf16(); // Null terminate before passing on. - t += [0u16]; + t.push(0u16); vec::as_imm_buf(t, |buf, _len| f(buf)) } }