summary refs log tree commit diff
path: root/src/libgraphviz
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-07-18 03:46:23 +0000
committerbors <bors@rust-lang.org>2014-07-18 03:46:23 +0000
commit8a308b167f3a7feea3f1cd4b3be0a5048872e041 (patch)
tree615c76b7713cf1fc1b75d993a27b7843db3d57e8 /src/libgraphviz
parentcebed8ab921e7e5f539236ae7ef87ee1992eaaaf (diff)
parent8107ef77f0647158e693c22bbee1a2f71a0c4e37 (diff)
downloadrust-8a308b167f3a7feea3f1cd4b3be0a5048872e041.tar.gz
rust-8a308b167f3a7feea3f1cd4b3be0a5048872e041.zip
auto merge of #15725 : aochagavia/rust/vec, r=alexcrichton
* Deprecated `to_owned` in favor of `to_vec`
* Deprecated `into_owned` in favor of `into_vec`

[breaking-change]
Diffstat (limited to 'src/libgraphviz')
-rw-r--r--src/libgraphviz/maybe_owned_vec.rs12
1 files changed, 6 insertions, 6 deletions
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 @@ impl<'a,T:fmt::Show> fmt::Show for MaybeOwnedVector<'a,T> {
 
 impl<'a,T:Clone> CloneableVector<T> for MaybeOwnedVector<'a,T> {
     /// Returns a copy of `self`.
-    fn to_owned(&self) -> Vec<T> {
-        self.as_slice().to_owned()
+    fn to_vec(&self) -> Vec<T> {
+        self.as_slice().to_vec()
     }
 
     /// Convert `self` into an owned slice, not making a copy if possible.
-    fn into_owned(self) -> Vec<T> {
+    fn into_vec(self) -> Vec<T> {
         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 @@ impl<'a,T:Clone> CloneableVector<T> for MaybeOwnedVector<'a,T> {
 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)
         }
     }