From 8107ef77f0647158e693c22bbee1a2f71a0c4e37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adolfo=20Ochagav=C3=ADa?= Date: Wed, 16 Jul 2014 22:37:28 +0200 Subject: [PATCH] Rename functions in the CloneableVector trait * Deprecated `to_owned` in favor of `to_vec` * Deprecated `into_owned` in favor of `into_vec` [breaking-change] --- src/libcollections/slice.rs | 34 +++++++++++++------ src/libcollections/vec.rs | 4 +-- src/libgraphviz/maybe_owned_vec.rs | 12 +++---- src/librustc/back/link.rs | 2 +- src/librustc/driver/mod.rs | 2 +- src/librustc/metadata/filesearch.rs | 8 ++--- src/librustc/middle/dataflow.rs | 4 +-- src/librustc/middle/save/mod.rs | 15 ++++---- src/librustc/middle/save/recorder.rs | 4 +-- src/librustc/middle/typeck/infer/test.rs | 4 +-- src/librustrt/c_str.rs | 4 +-- src/libsyntax/ext/expand.rs | 2 +- src/test/bench/shootout-k-nucleotide-pipes.rs | 4 +-- src/test/bench/shootout-regex-dna.rs | 2 +- src/test/run-pass/issue-1696.rs | 2 +- src/test/run-pass/issue-4241.rs | 2 +- 16 files changed, 59 insertions(+), 46 deletions(-) diff --git a/src/libcollections/slice.rs b/src/libcollections/slice.rs index 40cf8495a40..1c5aa8a323b 100644 --- a/src/libcollections/slice.rs +++ b/src/libcollections/slice.rs @@ -277,21 +277,33 @@ fn size_hint(&self) -> (uint, Option) { /// Extension methods for vector slices with cloneable elements pub trait CloneableVector { - /// Copy `self` into a new owned vector - fn to_owned(&self) -> Vec; + /// Copy `self` into a new vector + fn to_vec(&self) -> Vec; + + /// Deprecated. Use `to_vec` + #[deprecated = "Replaced by `to_vec`"] + fn to_owned(&self) -> Vec { + self.to_vec() + } /// Convert `self` into an owned vector, not making a copy if possible. - fn into_owned(self) -> Vec; + fn into_vec(self) -> Vec; + + /// Deprecated. Use `into_vec` + #[deprecated = "Replaced by `into_vec`"] + fn into_owned(self) -> Vec { + self.into_vec() + } } /// Extension methods for vector slices impl<'a, T: Clone> CloneableVector for &'a [T] { /// Returns a copy of `v`. #[inline] - fn to_owned(&self) -> Vec { Vec::from_slice(*self) } + fn to_vec(&self) -> Vec { Vec::from_slice(*self) } #[inline(always)] - fn into_owned(self) -> Vec { self.to_owned() } + fn into_vec(self) -> Vec { self.to_vec() } } /// Extension methods for vectors containing `Clone` elements. @@ -325,7 +337,7 @@ fn partitioned(&self, f: |&T| -> bool) -> (Vec, Vec) { fn permutations(self) -> Permutations { Permutations{ swaps: ElementSwaps::new(self.len()), - v: self.to_owned(), + v: self.to_vec(), } } @@ -888,7 +900,7 @@ fn test_last() { fn test_slice() { // Test fixed length vector. let vec_fixed = [1i, 2, 3, 4]; - let v_a = vec_fixed.slice(1u, vec_fixed.len()).to_owned(); + let v_a = vec_fixed.slice(1u, vec_fixed.len()).to_vec(); assert_eq!(v_a.len(), 3u); let v_a = v_a.as_slice(); assert_eq!(v_a[0], 2); @@ -897,7 +909,7 @@ fn test_slice() { // Test on stack. let vec_stack = &[1i, 2, 3]; - let v_b = vec_stack.slice(1u, 3u).to_owned(); + let v_b = vec_stack.slice(1u, 3u).to_vec(); assert_eq!(v_b.len(), 2u); let v_b = v_b.as_slice(); assert_eq!(v_b[0], 2); @@ -905,7 +917,7 @@ fn test_slice() { // Test `Box<[T]>` let vec_unique = vec![1i, 2, 3, 4, 5, 6]; - let v_d = vec_unique.slice(1u, 6u).to_owned(); + let v_d = vec_unique.slice(1u, 6u).to_vec(); assert_eq!(v_d.len(), 5u); let v_d = v_d.as_slice(); assert_eq!(v_d[0], 2); @@ -1132,7 +1144,7 @@ fn test_permutations() { let (min_size, max_opt) = it.size_hint(); assert_eq!(min_size, 1); assert_eq!(max_opt.unwrap(), 1); - assert_eq!(it.next(), Some(v.as_slice().to_owned())); + assert_eq!(it.next(), Some(v.as_slice().to_vec())); assert_eq!(it.next(), None); } { @@ -1141,7 +1153,7 @@ fn test_permutations() { let (min_size, max_opt) = it.size_hint(); assert_eq!(min_size, 1); assert_eq!(max_opt.unwrap(), 1); - assert_eq!(it.next(), Some(v.as_slice().to_owned())); + assert_eq!(it.next(), Some(v.as_slice().to_vec())); assert_eq!(it.next(), None); } { diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs index 1e96588dac5..94ca1beeb6d 100644 --- a/src/libcollections/vec.rs +++ b/src/libcollections/vec.rs @@ -422,8 +422,8 @@ fn len(&self) -> uint { } impl CloneableVector for Vec { - fn to_owned(&self) -> Vec { self.clone() } - fn into_owned(self) -> Vec { self } + fn to_vec(&self) -> Vec { self.clone() } + fn into_vec(self) -> Vec { self } } // FIXME: #13996: need a way to mark the return value as `noalias` diff --git a/src/libgraphviz/maybe_owned_vec.rs b/src/libgraphviz/maybe_owned_vec.rs index bd19f19cec6..ec60be19515 100644 --- a/src/libgraphviz/maybe_owned_vec.rs +++ b/src/libgraphviz/maybe_owned_vec.rs @@ -124,15 +124,15 @@ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { impl<'a,T:Clone> CloneableVector for MaybeOwnedVector<'a,T> { /// Returns a copy of `self`. - fn to_owned(&self) -> Vec { - self.as_slice().to_owned() + fn to_vec(&self) -> Vec { + self.as_slice().to_vec() } /// Convert `self` into an owned slice, not making a copy if possible. - fn into_owned(self) -> Vec { + fn into_vec(self) -> Vec { match self { - Growable(v) => v.as_slice().to_owned(), - Borrowed(v) => v.to_owned(), + Growable(v) => v.as_slice().to_vec(), + Borrowed(v) => v.to_vec(), } } } @@ -140,7 +140,7 @@ fn into_owned(self) -> Vec { impl<'a, T: Clone> Clone for MaybeOwnedVector<'a, T> { fn clone(&self) -> MaybeOwnedVector<'a, T> { match *self { - Growable(ref v) => Growable(v.to_owned()), + Growable(ref v) => Growable(v.to_vec()), Borrowed(v) => Borrowed(v) } } diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs index 6fa8a153023..b049f119bc2 100644 --- a/src/librustc/back/link.rs +++ b/src/librustc/back/link.rs @@ -1238,7 +1238,7 @@ fn link_args(cmd: &mut Command, abi::OsMacos | abi::OsiOS => { let morestack = lib_path.join("libmorestack.a"); - let mut v = "-Wl,-force_load,".as_bytes().to_owned(); + let mut v = b"-Wl,-force_load,".to_vec(); v.push_all(morestack.as_vec()); cmd.arg(v.as_slice()); } diff --git a/src/librustc/driver/mod.rs b/src/librustc/driver/mod.rs index 3fd402c90fd..e433c3df864 100644 --- a/src/librustc/driver/mod.rs +++ b/src/librustc/driver/mod.rs @@ -36,7 +36,7 @@ pub fn main_args(args: &[String]) -> int { - let owned_args = args.to_owned(); + let owned_args = args.to_vec(); monitor(proc() run_compiler(owned_args.as_slice())); 0 } diff --git a/src/librustc/metadata/filesearch.rs b/src/librustc/metadata/filesearch.rs index c15148f75df..99b98b690fa 100644 --- a/src/librustc/metadata/filesearch.rs +++ b/src/librustc/metadata/filesearch.rs @@ -46,7 +46,7 @@ pub fn for_each_lib_search_path(&self, f: |&Path| -> FileMatch) { FileMatches => found = true, FileDoesntMatch => () } - visited_dirs.insert(path.as_vec().to_owned()); + visited_dirs.insert(path.as_vec().to_vec()); } debug!("filesearch: searching lib path"); @@ -59,7 +59,7 @@ pub fn for_each_lib_search_path(&self, f: |&Path| -> FileMatch) { } } - visited_dirs.insert(tlib_path.as_vec().to_owned()); + visited_dirs.insert(tlib_path.as_vec().to_vec()); // Try RUST_PATH if !found { let rustpath = rust_path(); @@ -67,10 +67,10 @@ pub fn for_each_lib_search_path(&self, f: |&Path| -> FileMatch) { let tlib_path = make_rustpkg_lib_path( self.sysroot, path, self.triple); debug!("is {} in visited_dirs? {:?}", tlib_path.display(), - visited_dirs.contains_equiv(&tlib_path.as_vec().to_owned())); + visited_dirs.contains_equiv(&tlib_path.as_vec().to_vec())); if !visited_dirs.contains_equiv(&tlib_path.as_vec()) { - visited_dirs.insert(tlib_path.as_vec().to_owned()); + visited_dirs.insert(tlib_path.as_vec().to_vec()); // Don't keep searching the RUST_PATH if one match turns up -- // if we did, we'd get a "multiple matching crates" error match f(&tlib_path) { diff --git a/src/librustc/middle/dataflow.rs b/src/librustc/middle/dataflow.rs index b28c0158584..e9c7a1cccb3 100644 --- a/src/librustc/middle/dataflow.rs +++ b/src/librustc/middle/dataflow.rs @@ -369,7 +369,7 @@ pub fn each_bit_for_node(&self, let slice = match e { Entry => on_entry, Exit => { - let mut t = on_entry.to_owned(); + let mut t = on_entry.to_vec(); self.apply_gen_kill_frozen(cfgidx, t.as_mut_slice()); temp_bits = t; temp_bits.as_slice() @@ -445,7 +445,7 @@ pub fn add_kills_from_flow_exits(&mut self, cfg: &cfg::CFG) { cfg.graph.each_edge(|_edge_index, edge| { let flow_exit = edge.source(); let (start, end) = self.compute_id_range(flow_exit); - let mut orig_kills = self.kills.slice(start, end).to_owned(); + let mut orig_kills = self.kills.slice(start, end).to_vec(); let mut changed = false; for &node_id in edge.data.exiting_scopes.iter() { diff --git a/src/librustc/middle/save/mod.rs b/src/librustc/middle/save/mod.rs index 9ae2a4c62cd..de61cf808d2 100644 --- a/src/librustc/middle/save/mod.rs +++ b/src/librustc/middle/save/mod.rs @@ -1136,10 +1136,11 @@ fn visit_view_item(&mut self, i:&ast::ViewItem, e:DxrVisitorEnv) { } }, ast::ViewItemExternCrate(ident, ref s, id) => { - let name = get_ident(ident).get().to_owned(); + let name = get_ident(ident); + let name = name.get(); let s = match *s { - Some((ref s, _)) => s.get().to_owned(), - None => name.to_owned(), + Some((ref s, _)) => s.get().to_string(), + None => name.to_string(), }; let sub_span = self.span.sub_span_after_keyword(i.span, keywords::Crate); let cnum = match self.sess.cstore.find_extern_mod_stmt_cnum(id) { @@ -1150,7 +1151,7 @@ fn visit_view_item(&mut self, i:&ast::ViewItem, e:DxrVisitorEnv) { sub_span, id, cnum, - name.as_slice(), + name, s.as_slice(), e.cur_scope); }, @@ -1273,9 +1274,9 @@ fn visit_arm(&mut self, arm: &ast::Arm, e: DxrVisitorEnv) { // process collected paths for &(id, ref p, ref immut, ref_kind) in self.collected_paths.iter() { let value = if *immut { - self.span.snippet(p.span).into_owned() + self.span.snippet(p.span).into_string() } else { - "".to_owned() + "".to_string() }; let sub_span = self.span.span_for_first_ident(p.span); let def_map = self.analysis.ty_cx.def_map.borrow(); @@ -1330,7 +1331,7 @@ fn visit_local(&mut self, l:&ast::Local, e: DxrVisitorEnv) { let value = self.span.snippet(l.span); for &(id, ref p, ref immut, _) in self.collected_paths.iter() { - let value = if *immut { value.to_owned() } else { "".to_owned() }; + let value = if *immut { value.to_string() } else { "".to_string() }; let types = self.analysis.ty_cx.node_types.borrow(); let typ = ppaux::ty_to_string(&self.analysis.ty_cx, *types.get(&(id as uint))); // Get the span only for the name of the variable (I hope the path diff --git a/src/librustc/middle/save/recorder.rs b/src/librustc/middle/save/recorder.rs index 7869aec1683..1af6fde02af 100644 --- a/src/librustc/middle/save/recorder.rs +++ b/src/librustc/middle/save/recorder.rs @@ -170,7 +170,7 @@ pub fn make_values_str(&self, String::from_str(v) } ))); - Some(strs.fold(String::new(), |s, ss| s.append(ss.as_slice()))).map(|s| s.into_owned()) + Some(strs.fold(String::new(), |s, ss| s.append(ss.as_slice()))) } pub fn record_without_span(&mut self, @@ -503,7 +503,7 @@ pub fn meth_call_str(&mut self, }; let (dcn, dck) = match declid { Some(declid) => (s!(declid.node), s!(declid.krate)), - None => ("".to_owned(), "".to_owned()) + None => ("".to_string(), "".to_string()) }; self.check_and_record(MethodCall, span, diff --git a/src/librustc/middle/typeck/infer/test.rs b/src/librustc/middle/typeck/infer/test.rs index c06e40fce14..fc8d315e156 100644 --- a/src/librustc/middle/typeck/infer/test.rs +++ b/src/librustc/middle/typeck/infer/test.rs @@ -95,7 +95,7 @@ fn custom_emit(&mut self, } fn errors(msgs: &[&str]) -> (Box, uint) { - let v = Vec::from_fn(msgs.len(), |i| msgs[i].to_owned()); + let v = msgs.iter().map(|m| m.to_string()).collect(); (box ExpectErrorEmitter { messages: v } as Box, msgs.len()) } @@ -114,7 +114,7 @@ fn test_env(_test_name: &str, let sess = session::build_session_(options, None, span_diagnostic_handler); let krate_config = Vec::new(); - let input = driver::StrInput(source_string.to_owned()); + let input = driver::StrInput(source_string.to_string()); let krate = driver::phase_1_parse_input(&sess, krate_config, &input); let (krate, ast_map) = driver::phase_2_configure_and_expand(&sess, krate, "test") diff --git a/src/librustrt/c_str.rs b/src/librustrt/c_str.rs index 396d51f4fcb..0f2fcaff310 100644 --- a/src/librustrt/c_str.rs +++ b/src/librustrt/c_str.rs @@ -778,11 +778,11 @@ fn foo(f: |c: &CString|) { c_ = Some(c.clone()); c.clone(); // force a copy, reading the memory - c.as_bytes().to_owned(); + c.as_bytes().to_vec(); }); let c_ = c_.unwrap(); // force a copy, reading the memory - c_.as_bytes().to_owned(); + c_.as_bytes().to_vec(); } #[test] diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index 58689389769..9fb25787c81 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -1544,7 +1544,7 @@ macro_rules! iterator_impl { fn run_renaming_test(t: &RenamingTest, test_idx: uint) { let invalid_name = token::special_idents::invalid.name; let (teststr, bound_connections, bound_ident_check) = match *t { - (ref str,ref conns, bic) => (str.to_owned(), conns.clone(), bic) + (ref str,ref conns, bic) => (str.to_string(), conns.clone(), bic) }; let cr = expand_crate_str(teststr.to_string()); let bindings = crate_bindings(&cr); diff --git a/src/test/bench/shootout-k-nucleotide-pipes.rs b/src/test/bench/shootout-k-nucleotide-pipes.rs index b3deb88543e..143175e558b 100644 --- a/src/test/bench/shootout-k-nucleotide-pipes.rs +++ b/src/test/bench/shootout-k-nucleotide-pipes.rs @@ -72,7 +72,7 @@ fn sortKV(mut orig: Vec<(Vec ,f64)> ) -> Vec<(Vec ,f64)> { // given a map, search for the frequency of a pattern fn find(mm: &HashMap , uint>, key: String) -> uint { - let key = key.to_owned().into_ascii().as_slice().to_lower().into_string(); + let key = key.into_ascii().as_slice().to_lower().into_string(); match mm.find_equiv(&key.as_bytes()) { option::None => { return 0u; } option::Some(&num) => { return num; } @@ -179,7 +179,7 @@ fn main() { let mut proc_mode = false; for line in rdr.lines() { - let line = line.unwrap().as_slice().trim().to_owned(); + let line = line.unwrap().as_slice().trim().to_string(); if line.len() == 0u { continue; } diff --git a/src/test/bench/shootout-regex-dna.rs b/src/test/bench/shootout-regex-dna.rs index bdf6862d0b1..8908b5b87ed 100644 --- a/src/test/bench/shootout-regex-dna.rs +++ b/src/test/bench/shootout-regex-dna.rs @@ -109,7 +109,7 @@ fn main() { let (mut variant_strs, mut counts) = (vec!(), vec!()); for variant in variants.move_iter() { let seq_arc_copy = seq_arc.clone(); - variant_strs.push(variant.to_string().to_owned()); + variant_strs.push(variant.to_string()); counts.push(Future::spawn(proc() { count_matches(seq_arc_copy.as_slice(), &variant) })); diff --git a/src/test/run-pass/issue-1696.rs b/src/test/run-pass/issue-1696.rs index c05e84b6e69..291fab29584 100644 --- a/src/test/run-pass/issue-1696.rs +++ b/src/test/run-pass/issue-1696.rs @@ -15,6 +15,6 @@ pub fn main() { let mut m = HashMap::new(); - m.insert("foo".as_bytes().to_owned(), "bar".as_bytes().to_owned()); + m.insert(b"foo".to_vec(), b"bar".to_vec()); println!("{:?}", m); } diff --git a/src/test/run-pass/issue-4241.rs b/src/test/run-pass/issue-4241.rs index 3ebc3e64573..15423121fda 100644 --- a/src/test/run-pass/issue-4241.rs +++ b/src/test/run-pass/issue-4241.rs @@ -56,7 +56,7 @@ enum Result { } priv fn chop(s: String) -> String { - s.slice(0, s.len() - 1).to_owned() + s.slice(0, s.len() - 1).to_string() } priv fn parse_bulk(io: @io::Reader) -> Result {