Skip to content

Commit e466109

Browse files
borsbors
committed
Auto merge of #23104 - japaric:inherent, r=nikomatsakis
- Allow inherent implementations on `char`, `str`, `[T]`, `*const T`, `*mut T` and all the numeric primitives. - copy `unicode::char::CharExt` methods into `impl char` - remove `unicode::char::CharExt`, its re-export `std::char::CharExt` and `CharExt` from the prelude - copy `collections::str::StrExt` methods into `impl str` - remove `collections::str::StrExt` its re-export `std::str::StrExt`, and `StrExt` from the prelude - copy `collections::slice::SliceExt` methods into `impl<T> [T]` - remove `collections::slice::SliceExt` its re-export `std::slice::SliceExt`, and `SliceExt` from the prelude - copy `core::ptr::PtrExt` methods into `impl<T> *const T` - remove `core::ptr::PtrExt` its re-export `std::ptr::PtrExt`, and `PtrExt` from the prelude - copy `core::ptr::PtrExt` and `core::ptr::MutPtrExt` methods into `impl<T> *mut T` - remove `core::ptr::MutPtrExt` its re-export `std::ptr::MutPtrExt`, and `MutPtrExt` from the prelude - copy `core::num::Int` and `core::num::SignedInt` methods into `impl i{8,16,32,64,size}` - copy `core::num::Int` and `core::num::UnsignedInt` methods into `impl u{8,16,32,64,size}` - remove `core::num::UnsignedInt` and its re-export `std::num::UnsignedInt` - move `collections` tests into its own crate: `collectionstest` - copy `core::num::Float` methods into `impl f{32,64}` Because this PR removes several traits, this is a [breaking-change], however functionality remains unchanged and breakage due to unresolved imports should be minimal. If you encounter an error due to an unresolved import, simply remove the import: ``` diff fn main() { - use std::num::UnsignedInt; //~ error: unresolved import `std::num::UnsignedInt`. - println!("{}", 8_usize.is_power_of_two()); } ``` --- cc #16862 [preview docs](http://japaric.github.io/inherent/std/index.html) [unicode::char](http://japaric.github.io/inherent/unicode/primitive.char.html) [collections::str](http://japaric.github.io/inherent/collections/primitive.str.html) [std::f32](http://japaric.github.io/inherent/std/primitive.f32.html)
2 parents a257288 + b65ebc4 commit e466109

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+15384
-8830
lines changed

‎mk/dist.mk

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ PKG_FILES := \
5353
driver \
5454
etc \
5555
$(foreach crate,$(CRATES),lib$(crate)) \
56+
libcollectionstest \
5657
libcoretest \
5758
libbacktrace \
5859
rt \

‎mk/tests.mk

+4-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919
DEPS_coretest :=
2020
$(eval $(call RUST_CRATE,coretest))
2121

22-
TEST_TARGET_CRATES = $(filter-out core unicode,$(TARGET_CRATES)) coretest
22+
DEPS_collectionstest :=
23+
$(eval $(call RUST_CRATE,collectionstest))
24+
25+
TEST_TARGET_CRATES = $(filter-out core unicode,$(TARGET_CRATES)) collectionstest coretest
2326
TEST_DOC_CRATES = $(DOC_CRATES)
2427
TEST_HOST_CRATES = $(filter-out rustc_typeck rustc_borrowck rustc_resolve rustc_trans rustc_lint,\
2528
$(HOST_CRATES))

‎src/liballoc/heap.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
#[cfg(stage0)]
1112
#[cfg(not(test))]
1213
use core::ptr::PtrExt;
1314

@@ -387,7 +388,6 @@ mod imp {
387388
mod test {
388389
extern crate test;
389390
use self::test::Bencher;
390-
use core::ptr::PtrExt;
391391
use boxed::Box;
392392
use heap;
393393

‎src/liballoc/rc.rs

+3
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,10 @@ use core::nonzero::NonZero;
159159
use core::ops::{Deref, Drop};
160160
use core::option::Option;
161161
use core::option::Option::{Some, None};
162+
#[cfg(stage0)]
162163
use core::ptr::{self, PtrExt};
164+
#[cfg(not(stage0))]
165+
use core::ptr;
163166
use core::result::Result;
164167
use core::result::Result::{Ok, Err};
165168
use core::intrinsics::assume;

‎src/libarena/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ use std::intrinsics::{TyDesc, get_tydesc};
4646
use std::intrinsics;
4747
use std::marker;
4848
use std::mem;
49+
#[cfg(stage0)]
4950
use std::num::{Int, UnsignedInt};
5051
use std::ptr;
5152
use std::rc::Rc;

‎src/libcollections/binary_heap.rs

-215
Original file line numberDiff line numberDiff line change
@@ -693,218 +693,3 @@ impl<T: Ord> Extend<T> for BinaryHeap<T> {
693693
}
694694
}
695695
}
696-
697-
#[cfg(test)]
698-
mod tests {
699-
use prelude::*;
700-
701-
use super::BinaryHeap;
702-
703-
#[test]
704-
fn test_iterator() {
705-
let data = vec![5, 9, 3];
706-
let iterout = [9, 5, 3];
707-
let heap = BinaryHeap::from_vec(data);
708-
let mut i = 0;
709-
for el in &heap {
710-
assert_eq!(*el, iterout[i]);
711-
i += 1;
712-
}
713-
}
714-
715-
#[test]
716-
fn test_iterator_reverse() {
717-
let data = vec![5, 9, 3];
718-
let iterout = vec![3, 5, 9];
719-
let pq = BinaryHeap::from_vec(data);
720-
721-
let v: Vec<_> = pq.iter().rev().cloned().collect();
722-
assert_eq!(v, iterout);
723-
}
724-
725-
#[test]
726-
fn test_move_iter() {
727-
let data = vec![5, 9, 3];
728-
let iterout = vec![9, 5, 3];
729-
let pq = BinaryHeap::from_vec(data);
730-
731-
let v: Vec<_> = pq.into_iter().collect();
732-
assert_eq!(v, iterout);
733-
}
734-
735-
#[test]
736-
fn test_move_iter_size_hint() {
737-
let data = vec![5, 9];
738-
let pq = BinaryHeap::from_vec(data);
739-
740-
let mut it = pq.into_iter();
741-
742-
assert_eq!(it.size_hint(), (2, Some(2)));
743-
assert_eq!(it.next(), Some(9));
744-
745-
assert_eq!(it.size_hint(), (1, Some(1)));
746-
assert_eq!(it.next(), Some(5));
747-
748-
assert_eq!(it.size_hint(), (0, Some(0)));
749-
assert_eq!(it.next(), None);
750-
}
751-
752-
#[test]
753-
fn test_move_iter_reverse() {
754-
let data = vec![5, 9, 3];
755-
let iterout = vec![3, 5, 9];
756-
let pq = BinaryHeap::from_vec(data);
757-
758-
let v: Vec<_> = pq.into_iter().rev().collect();
759-
assert_eq!(v, iterout);
760-
}
761-
762-
#[test]
763-
fn test_peek_and_pop() {
764-
let data = vec![2, 4, 6, 2, 1, 8, 10, 3, 5, 7, 0, 9, 1];
765-
let mut sorted = data.clone();
766-
sorted.sort();
767-
let mut heap = BinaryHeap::from_vec(data);
768-
while !heap.is_empty() {
769-
assert_eq!(heap.peek().unwrap(), sorted.last().unwrap());
770-
assert_eq!(heap.pop().unwrap(), sorted.pop().unwrap());
771-
}
772-
}
773-
774-
#[test]
775-
fn test_push() {
776-
let mut heap = BinaryHeap::from_vec(vec![2, 4, 9]);
777-
assert_eq!(heap.len(), 3);
778-
assert!(*heap.peek().unwrap() == 9);
779-
heap.push(11);
780-
assert_eq!(heap.len(), 4);
781-
assert!(*heap.peek().unwrap() == 11);
782-
heap.push(5);
783-
assert_eq!(heap.len(), 5);
784-
assert!(*heap.peek().unwrap() == 11);
785-
heap.push(27);
786-
assert_eq!(heap.len(), 6);
787-
assert!(*heap.peek().unwrap() == 27);
788-
heap.push(3);
789-
assert_eq!(heap.len(), 7);
790-
assert!(*heap.peek().unwrap() == 27);
791-
heap.push(103);
792-
assert_eq!(heap.len(), 8);
793-
assert!(*heap.peek().unwrap() == 103);
794-
}
795-
796-
#[test]
797-
fn test_push_unique() {
798-
let mut heap = BinaryHeap::<Box<_>>::from_vec(vec![box 2, box 4, box 9]);
799-
assert_eq!(heap.len(), 3);
800-
assert!(*heap.peek().unwrap() == box 9);
801-
heap.push(box 11);
802-
assert_eq!(heap.len(), 4);
803-
assert!(*heap.peek().unwrap() == box 11);
804-
heap.push(box 5);
805-
assert_eq!(heap.len(), 5);
806-
assert!(*heap.peek().unwrap() == box 11);
807-
heap.push(box 27);
808-
assert_eq!(heap.len(), 6);
809-
assert!(*heap.peek().unwrap() == box 27);
810-
heap.push(box 3);
811-
assert_eq!(heap.len(), 7);
812-
assert!(*heap.peek().unwrap() == box 27);
813-
heap.push(box 103);
814-
assert_eq!(heap.len(), 8);
815-
assert!(*heap.peek().unwrap() == box 103);
816-
}
817-
818-
#[test]
819-
fn test_push_pop() {
820-
let mut heap = BinaryHeap::from_vec(vec![5, 5, 2, 1, 3]);
821-
assert_eq!(heap.len(), 5);
822-
assert_eq!(heap.push_pop(6), 6);
823-
assert_eq!(heap.len(), 5);
824-
assert_eq!(heap.push_pop(0), 5);
825-
assert_eq!(heap.len(), 5);
826-
assert_eq!(heap.push_pop(4), 5);
827-
assert_eq!(heap.len(), 5);
828-
assert_eq!(heap.push_pop(1), 4);
829-
assert_eq!(heap.len(), 5);
830-
}
831-
832-
#[test]
833-
fn test_replace() {
834-
let mut heap = BinaryHeap::from_vec(vec![5, 5, 2, 1, 3]);
835-
assert_eq!(heap.len(), 5);
836-
assert_eq!(heap.replace(6).unwrap(), 5);
837-
assert_eq!(heap.len(), 5);
838-
assert_eq!(heap.replace(0).unwrap(), 6);
839-
assert_eq!(heap.len(), 5);
840-
assert_eq!(heap.replace(4).unwrap(), 5);
841-
assert_eq!(heap.len(), 5);
842-
assert_eq!(heap.replace(1).unwrap(), 4);
843-
assert_eq!(heap.len(), 5);
844-
}
845-
846-
fn check_to_vec(mut data: Vec<i32>) {
847-
let heap = BinaryHeap::from_vec(data.clone());
848-
let mut v = heap.clone().into_vec();
849-
v.sort();
850-
data.sort();
851-
852-
assert_eq!(v, data);
853-
assert_eq!(heap.into_sorted_vec(), data);
854-
}
855-
856-
#[test]
857-
fn test_to_vec() {
858-
check_to_vec(vec![]);
859-
check_to_vec(vec![5]);
860-
check_to_vec(vec![3, 2]);
861-
check_to_vec(vec![2, 3]);
862-
check_to_vec(vec![5, 1, 2]);
863-
check_to_vec(vec![1, 100, 2, 3]);
864-
check_to_vec(vec![1, 3, 5, 7, 9, 2, 4, 6, 8, 0]);
865-
check_to_vec(vec![2, 4, 6, 2, 1, 8, 10, 3, 5, 7, 0, 9, 1]);
866-
check_to_vec(vec![9, 11, 9, 9, 9, 9, 11, 2, 3, 4, 11, 9, 0, 0, 0, 0]);
867-
check_to_vec(vec![0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
868-
check_to_vec(vec![10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0]);
869-
check_to_vec(vec![0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 1, 2]);
870-
check_to_vec(vec![5, 4, 3, 2, 1, 5, 4, 3, 2, 1, 5, 4, 3, 2, 1]);
871-
}
872-
873-
#[test]
874-
fn test_empty_pop() {
875-
let mut heap = BinaryHeap::<i32>::new();
876-
assert!(heap.pop().is_none());
877-
}
878-
879-
#[test]
880-
fn test_empty_peek() {
881-
let empty = BinaryHeap::<i32>::new();
882-
assert!(empty.peek().is_none());
883-
}
884-
885-
#[test]
886-
fn test_empty_replace() {
887-
let mut heap = BinaryHeap::new();
888-
assert!(heap.replace(5).is_none());
889-
}
890-
891-
#[test]
892-
fn test_from_iter() {
893-
let xs = vec![9, 8, 7, 6, 5, 4, 3, 2, 1];
894-
895-
let mut q: BinaryHeap<_> = xs.iter().rev().cloned().collect();
896-
897-
for &x in &xs {
898-
assert_eq!(q.pop().unwrap(), x);
899-
}
900-
}
901-
902-
#[test]
903-
fn test_drain() {
904-
let mut q: BinaryHeap<_> = [9, 8, 7, 6, 5, 4, 3, 2, 1].iter().cloned().collect();
905-
906-
assert_eq!(q.drain().take(5).count(), 5);
907-
908-
assert!(q.is_empty());
909-
}
910-
}

0 commit comments

Comments
 (0)