Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ci #848

Merged
merged 6 commits into from Nov 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -4,7 +4,7 @@ sudo: required
dist: trusty
matrix:
include:
- rust: 1.37.0
- rust: 1.42.0
env:
- FEATURES='test docs'
- RUSTFLAGS='-D warnings'
Expand Down
4 changes: 1 addition & 3 deletions src/error.rs
Expand Up @@ -33,6 +33,7 @@ impl ShapeError {
///
/// This enumeration is not exhaustive. The representation of the enum
/// is not guaranteed.
#[non_exhaustive]
#[derive(Copy, Clone, Debug)]
pub enum ErrorKind {
/// incompatible shape
Expand All @@ -47,8 +48,6 @@ pub enum ErrorKind {
Unsupported,
/// overflow when computing offset, length, etc.
Overflow,
#[doc(hidden)]
__Incomplete,
}

#[inline(always)]
Expand Down Expand Up @@ -81,7 +80,6 @@ impl fmt::Display for ShapeError {
ErrorKind::OutOfBounds => "out of bounds indexing",
ErrorKind::Unsupported => "unsupported operation",
ErrorKind::Overflow => "arithmetic overflow",
ErrorKind::__Incomplete => "this error variant is not in use",
};
write!(f, "ShapeError/{:?}: {}", self.kind(), description)
}
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Expand Up @@ -61,7 +61,7 @@
//! needs matching memory layout to be efficient (with some exceptions).
//! + Efficient floating point matrix multiplication even for very large
//! matrices; can optionally use BLAS to improve it further.
//! - **Requires Rust 1.37 or later**
//! - **Requires Rust 1.42 or later**
//!
//! ## Crate Feature Flags
//!
Expand Down
10 changes: 2 additions & 8 deletions src/slice.rs
Expand Up @@ -110,18 +110,12 @@ copy_and_clone! {SliceOrIndex}
impl SliceOrIndex {
/// Returns `true` if `self` is a `Slice` value.
pub fn is_slice(&self) -> bool {
match self {
SliceOrIndex::Slice { .. } => true,
_ => false,
}
matches!(self, SliceOrIndex::Slice { .. })
}

/// Returns `true` if `self` is an `Index` value.
pub fn is_index(&self) -> bool {
match self {
SliceOrIndex::Index(_) => true,
_ => false,
}
matches!(self, SliceOrIndex::Index(_))
}

/// Returns a new `SliceOrIndex` with the given step size (multiplied with
Expand Down
2 changes: 1 addition & 1 deletion src/stacking.rs
Expand Up @@ -165,7 +165,7 @@ where
let mut res = Array::from_shape_vec(res_dim, v)?;

res.axis_iter_mut(axis)
.zip(arrays.into_iter())
.zip(arrays.iter())
.for_each(|(mut assign_view, array)| {
assign_view.assign(&array);
});
Expand Down