From d1d2aa22c0d15465af1daccdb3821450c98d0ed0 Mon Sep 17 00:00:00 2001 From: Mazdak Farrokhzad Date: Tue, 23 Oct 2018 18:06:11 +0200 Subject: reduce list to functions callable in const ctx. --- src/liballoc/collections/btree/map.rs | 4 ++-- src/liballoc/collections/btree/set.rs | 4 ++-- src/liballoc/collections/vec_deque.rs | 2 +- src/liballoc/string.rs | 6 +++--- src/liballoc/vec.rs | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/liballoc') diff --git a/src/liballoc/collections/btree/map.rs b/src/liballoc/collections/btree/map.rs index 8a721a50b46..24c8fd3a969 100644 --- a/src/liballoc/collections/btree/map.rs +++ b/src/liballoc/collections/btree/map.rs @@ -2074,7 +2074,7 @@ impl BTreeMap { /// assert_eq!(a.len(), 1); /// ``` #[stable(feature = "rust1", since = "1.0.0")] - pub const fn len(&self) -> usize { + pub fn len(&self) -> usize { self.length } @@ -2093,7 +2093,7 @@ impl BTreeMap { /// assert!(!a.is_empty()); /// ``` #[stable(feature = "rust1", since = "1.0.0")] - pub const fn is_empty(&self) -> bool { + pub fn is_empty(&self) -> bool { self.len() == 0 } } diff --git a/src/liballoc/collections/btree/set.rs b/src/liballoc/collections/btree/set.rs index 6a0ecfd3f58..af9a7074e4a 100644 --- a/src/liballoc/collections/btree/set.rs +++ b/src/liballoc/collections/btree/set.rs @@ -730,7 +730,7 @@ impl BTreeSet { /// assert_eq!(v.len(), 1); /// ``` #[stable(feature = "rust1", since = "1.0.0")] - pub const fn len(&self) -> usize { + pub fn len(&self) -> usize { self.map.len() } @@ -747,7 +747,7 @@ impl BTreeSet { /// assert!(!v.is_empty()); /// ``` #[stable(feature = "rust1", since = "1.0.0")] - pub const fn is_empty(&self) -> bool { + pub fn is_empty(&self) -> bool { self.len() == 0 } } diff --git a/src/liballoc/collections/vec_deque.rs b/src/liballoc/collections/vec_deque.rs index b139b440fe1..e0ae7561d45 100644 --- a/src/liballoc/collections/vec_deque.rs +++ b/src/liballoc/collections/vec_deque.rs @@ -933,7 +933,7 @@ impl VecDeque { /// assert!(!v.is_empty()); /// ``` #[stable(feature = "rust1", since = "1.0.0")] - pub const fn is_empty(&self) -> bool { + pub fn is_empty(&self) -> bool { self.tail == self.head } diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs index 8f379c4cfb4..5c776292f53 100644 --- a/src/liballoc/string.rs +++ b/src/liballoc/string.rs @@ -1374,7 +1374,7 @@ impl String { /// ``` #[inline] #[stable(feature = "rust1", since = "1.0.0")] - pub const fn len(&self) -> usize { + pub fn len(&self) -> usize { self.vec.len() } @@ -1395,7 +1395,7 @@ impl String { /// ``` #[inline] #[stable(feature = "rust1", since = "1.0.0")] - pub const fn is_empty(&self) -> bool { + pub fn is_empty(&self) -> bool { self.len() == 0 } @@ -1662,7 +1662,7 @@ impl FromUtf8Error { /// assert_eq!(1, error.valid_up_to()); /// ``` #[stable(feature = "rust1", since = "1.0.0")] - pub const fn utf8_error(&self) -> Utf8Error { + pub fn utf8_error(&self) -> Utf8Error { self.error } } diff --git a/src/liballoc/vec.rs b/src/liballoc/vec.rs index 78e9da2084d..f7a0bbdceaf 100644 --- a/src/liballoc/vec.rs +++ b/src/liballoc/vec.rs @@ -1165,7 +1165,7 @@ impl Vec { /// ``` #[inline] #[stable(feature = "rust1", since = "1.0.0")] - pub const fn len(&self) -> usize { + pub fn len(&self) -> usize { self.len } @@ -1181,7 +1181,7 @@ impl Vec { /// assert!(!v.is_empty()); /// ``` #[stable(feature = "rust1", since = "1.0.0")] - pub const fn is_empty(&self) -> bool { + pub fn is_empty(&self) -> bool { self.len() == 0 } -- cgit 1.4.1-3-g733a5