From d1ffe5034b341a9a522c01705cafdb19bac9cedb Mon Sep 17 00:00:00 2001 From: Lenny222 Date: Tue, 3 Jan 2012 19:08:13 +0100 Subject: "str": rename "str_from_cstr" to "from_cstr" (analogous to the other "from_*") --- src/comp/back/link.rs | 2 +- src/comp/metadata/creader.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/comp') diff --git a/src/comp/back/link.rs b/src/comp/back/link.rs index 86974f3f3be..8950618c2e6 100644 --- a/src/comp/back/link.rs +++ b/src/comp/back/link.rs @@ -34,7 +34,7 @@ fn llvm_err(sess: session::session, msg: str) unsafe { let buf = llvm::LLVMRustGetLastError(); if buf == ptr::null() { sess.fatal(msg); - } else { sess.fatal(msg + ": " + str::str_from_cstr(buf)); } + } else { sess.fatal(msg + ": " + str::from_cstr(buf)); } } fn load_intrinsics_bc(sess: session::session) -> option::t { diff --git a/src/comp/metadata/creader.rs b/src/comp/metadata/creader.rs index 2536e2efcb5..21ead604d31 100644 --- a/src/comp/metadata/creader.rs +++ b/src/comp/metadata/creader.rs @@ -216,7 +216,7 @@ fn get_metadata_section(sess: session::session, let si = mk_section_iter(of.llof); while llvm::LLVMIsSectionIteratorAtEnd(of.llof, si.llsi) == False { let name_buf = llvm::LLVMGetSectionName(si.llsi); - let name = unsafe { str::str_from_cstr(name_buf) }; + let name = unsafe { str::from_cstr(name_buf) }; if str::eq(name, sess.get_targ_cfg().target_strs.meta_sect_name) { let cbuf = llvm::LLVMGetSectionContents(si.llsi); let csz = llvm::LLVMGetSectionSize(si.llsi); -- cgit 1.4.1-3-g733a5