Skip to content

Commit

Permalink
Merge pull request #173 from cuviper/superstar
Browse files Browse the repository at this point in the history
Reorder use super::* / super::internal::*
  • Loading branch information
nikomatsakis authored Dec 20, 2016
2 parents a38a53a + e345060 commit e328910
Show file tree
Hide file tree
Showing 19 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion src/par_iter/chain.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use super::*;
use super::internal::*;
use super::*;
use std::cmp::min;
use std::iter;

Expand Down
2 changes: 1 addition & 1 deletion src/par_iter/enumerate.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use super::*;
use super::internal::*;
use super::*;
use std::iter;
use std::ops::RangeFrom;

Expand Down
4 changes: 2 additions & 2 deletions src/par_iter/filter.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use super::*;
use super::len::*;
use super::internal::*;
use super::len::*;
use super::*;

pub struct Filter<M, FILTER_OP> {
base: M,
Expand Down
4 changes: 2 additions & 2 deletions src/par_iter/filter_map.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use super::*;
use super::len::*;
use super::internal::*;
use super::len::*;
use super::*;

pub struct FilterMap<M, FILTER_OP> {
base: M,
Expand Down
4 changes: 2 additions & 2 deletions src/par_iter/find.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::sync::atomic::{AtomicBool, Ordering};
use super::*;
use super::len::*;
use super::internal::*;
use super::len::*;
use super::*;

pub fn find<PAR_ITER, FIND_OP>(pi: PAR_ITER, find_op: FIND_OP) -> Option<PAR_ITER::Item>
where PAR_ITER: ParallelIterator,
Expand Down
2 changes: 1 addition & 1 deletion src/par_iter/flat_map.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use super::*;
use super::internal::*;
use super::*;
use std::f64;

pub struct FlatMap<M, MAP_OP> {
Expand Down
4 changes: 2 additions & 2 deletions src/par_iter/fold.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use super::*;
use super::len::*;
use super::internal::*;
use super::len::*;
use super::*;

pub fn fold<U, BASE, IDENTITY, FOLD_OP>(base: BASE,
identity: IDENTITY,
Expand Down
4 changes: 2 additions & 2 deletions src/par_iter/map.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use super::*;
use super::len::*;
use super::internal::*;
use super::len::*;
use super::*;

pub trait MapOp<In>: Sync {
type Output: Send;
Expand Down
2 changes: 1 addition & 1 deletion src/par_iter/option.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use super::*;
use super::internal::*;
use super::*;
use std;

pub struct OptionIter<T: Send> {
Expand Down
2 changes: 1 addition & 1 deletion src/par_iter/range.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use super::*;
use super::internal::*;
use super::*;
use std::ops::Range;

pub struct RangeIter<T> {
Expand Down
2 changes: 1 addition & 1 deletion src/par_iter/skip.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use super::*;
use super::internal::*;
use super::*;
use std::cmp::min;

pub struct Skip<M> {
Expand Down
2 changes: 1 addition & 1 deletion src/par_iter/slice.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use super::*;
use super::internal::*;
use super::*;

pub struct SliceIter<'data, T: 'data + Sync> {
slice: &'data [T],
Expand Down
2 changes: 1 addition & 1 deletion src/par_iter/slice_mut.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use super::*;
use super::internal::*;
use super::*;

pub struct SliceIterMut<'data, T: 'data + Send> {
slice: &'data mut [T],
Expand Down
2 changes: 1 addition & 1 deletion src/par_iter/string.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use super::*;
use super::internal::*;
use super::*;
use std::str::Chars;

/// Test if a byte is the start of a UTF-8 character.
Expand Down
2 changes: 1 addition & 1 deletion src/par_iter/take.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use super::*;
use super::internal::*;
use super::*;
use std::cmp::min;

pub struct Take<M> {
Expand Down
2 changes: 1 addition & 1 deletion src/par_iter/test.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::sync::atomic::{AtomicUsize, Ordering};

use super::*;
use super::internal::*;
use super::*;

use rand::{Rng, SeedableRng, XorShiftRng};
use std::collections::LinkedList;
Expand Down
2 changes: 1 addition & 1 deletion src/par_iter/vec.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use super::*;
use super::internal::*;
use super::*;
use std;

pub struct VecIter<T: Send> {
Expand Down
2 changes: 1 addition & 1 deletion src/par_iter/weight.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use super::*;
use super::internal::*;
use super::*;

pub struct Weight<M> {
base: M,
Expand Down
2 changes: 1 addition & 1 deletion src/par_iter/zip.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use super::*;
use super::internal::*;
use super::*;
use std::cmp::min;
use std::iter;

Expand Down

0 comments on commit e328910

Please sign in to comment.