Skip to content

Commit

Permalink
Merge pull request #1009 from rust-ndarray/fix-example-warnings
Browse files Browse the repository at this point in the history
Fix warnings in examples
  • Loading branch information
bluss committed May 19, 2021
2 parents f21c668 + b326ebe commit e7600e8
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 18 deletions.
1 change: 0 additions & 1 deletion src/arraytraits.rs
Expand Up @@ -176,7 +176,6 @@ where
///
/// ```rust
/// use ndarray::{Array, arr1};
/// use std::iter::FromIterator;
///
/// // Either use `from_iter` directly or use `Iterator::collect`.
/// let array = Array::from_iter((0..5).map(|x| x * x));
Expand Down
2 changes: 1 addition & 1 deletion src/doc/ndarray_for_numpy_users/coord_transform.rs
Expand Up @@ -83,7 +83,7 @@
//! for i in 0..nelems {
//! rotated
//! .slice_mut(s![.., .., i])
//! .assign({ &rmat.slice(s![.., .., i]).dot(&eye2d) });
//! .assign(&rmat.slice(s![.., .., i]).dot(&eye2d));
//! }
//! }
//! ```
Expand Down
2 changes: 1 addition & 1 deletion src/doc/ndarray_for_numpy_users/mod.rs
Expand Up @@ -179,7 +179,7 @@
//! ```
//! use ndarray::prelude::*;
//! #
//! # fn main() {}
//! # fn main() { let _ = arr0(1); }
//! ```
//!
//! ## Array creation
Expand Down
4 changes: 2 additions & 2 deletions src/doc/ndarray_for_numpy_users/rk_step.rs
Expand Up @@ -104,7 +104,7 @@
//! (y_new, f_new, error)
//! }
//! #
//! # fn main() {}
//! # fn main() { let _ = rk_step::<fn(_, ArrayView1<'_, _>) -> _>; }
//! ```
//!
//! It's possible to improve the efficiency by doing the following:
Expand Down Expand Up @@ -165,7 +165,7 @@
//! (y_new, error)
//! }
//! #
//! # fn main() {}
//! # fn main() { let _ = rk_step::<fn(_, ArrayView1<'_, f64>, ArrayViewMut1<'_, f64>)>; }
//! ```
//!
//! [f64.mul_add()]: https://doc.rust-lang.org/std/primitive.f64.html#method.mul_add
Expand Down
10 changes: 5 additions & 5 deletions src/impl_constructors.rs
Expand Up @@ -133,10 +133,10 @@ where
/// to type `A` fails.
///
/// ```rust
/// # #[cfg(feature = "approx")] {
/// use approx::assert_abs_diff_eq;
/// use ndarray::{Array, arr1};
///
/// # #[cfg(feature = "approx")] {
/// let array = Array::logspace(10.0, 0.0, 3.0, 4);
/// assert_abs_diff_eq!(array, arr1(&[1e0, 1e1, 1e2, 1e3]));
///
Expand All @@ -163,11 +163,11 @@ where
/// to type `A` fails.
///
/// ```rust
/// # fn example() -> Option<()> {
/// # #[cfg(feature = "approx")] {
/// use approx::assert_abs_diff_eq;
/// use ndarray::{Array, arr1};
///
/// # fn example() -> Option<()> {
/// # #[cfg(feature = "approx")] {
/// let array = Array::geomspace(1e0, 1e3, 4)?;
/// assert_abs_diff_eq!(array, arr1(&[1e0, 1e1, 1e2, 1e3]), epsilon = 1e-12);
///
Expand Down Expand Up @@ -541,8 +541,6 @@ where
///
/// ```
/// use ndarray::{s, Array2};
/// use ndarray::Zip;
/// use ndarray::Axis;
///
/// // Example Task: Let's create a column shifted copy of the input
///
Expand All @@ -561,6 +559,8 @@ where
/// b.assume_init()
/// }
/// }
///
/// # let _ = shift_by_two;
/// ```
pub fn uninit<Sh>(shape: Sh) -> ArrayBase<S::MaybeUninit, D>
where
Expand Down
7 changes: 3 additions & 4 deletions src/impl_methods.rs
Expand Up @@ -928,7 +928,7 @@ where
/// Iterator element is `ArrayView1<A>` (1D array view).
///
/// ```
/// use ndarray::{arr3, Axis, arr1};
/// use ndarray::arr3;
///
/// let a = arr3(&[[[ 0, 1, 2], // -- row 0, 0
/// [ 3, 4, 5]], // -- row 0, 1
Expand Down Expand Up @@ -996,7 +996,7 @@ where
/// Iterator element is `ArrayView1<A>` (1D array view).
///
/// ```
/// use ndarray::{arr3, Axis, arr1};
/// use ndarray::arr3;
///
/// // The generalized columns of a 3D array:
/// // are directed along the 0th axis: 0 and 6, 1 and 7 and so on...
Expand Down Expand Up @@ -1177,7 +1177,6 @@ where
/// ```
/// use ndarray::Array;
/// use ndarray::{arr3, Axis};
/// use std::iter::FromIterator;
///
/// let a = Array::from_iter(0..28).into_shape((2, 7, 2)).unwrap();
/// let mut iter = a.axis_chunks_iter(Axis(1), 2);
Expand Down Expand Up @@ -2397,10 +2396,10 @@ where
/// Elements are visited in arbitrary order.
///
/// ```
/// # #[cfg(feature = "approx")] {
/// use approx::assert_abs_diff_eq;
/// use ndarray::arr2;
///
/// # #[cfg(feature = "approx")] {
/// let mut a = arr2(&[[ 0., 1.],
/// [-1., 2.]]);
/// a.mapv_inplace(f32::exp);
Expand Down
2 changes: 1 addition & 1 deletion src/impl_views/conversions.rs
Expand Up @@ -96,7 +96,7 @@ impl<'a, A> ArrayViewMut<'a, A, Ix0> {
///
/// let mut array: Array0<f64> = arr0(5.);
/// let view = array.view_mut();
/// let mut scalar = view.into_scalar();
/// let scalar = view.into_scalar();
/// *scalar = 7.;
/// assert_eq!(scalar, &7.);
/// assert_eq!(array[()], 7.);
Expand Down
3 changes: 3 additions & 0 deletions src/lib.rs
Expand Up @@ -16,6 +16,9 @@
clippy::while_let_on_iterator, // is not an error
clippy::from_iter_instead_of_collect, // using from_iter is good style
)]
#![doc(test(attr(deny(warnings))))]
#![doc(test(attr(allow(unused_variables))))]
#![doc(test(attr(allow(deprecated))))]
#![cfg_attr(not(feature = "std"), no_std)]

//! The `ndarray` crate provides an *n*-dimensional container for general elements
Expand Down
3 changes: 2 additions & 1 deletion src/prelude.rs
Expand Up @@ -12,8 +12,9 @@
//! and macros that you can import easily as a group.
//!
//! ```
//!
//! use ndarray::prelude::*;
//!
//! # let _ = arr0(1); // use the import
//! ```

#[doc(no_inline)]
Expand Down
2 changes: 1 addition & 1 deletion src/slice.rs
Expand Up @@ -741,7 +741,7 @@ impl_slicenextdim!((), NewAxis, Ix0, Ix1);
/// + v.slice(s![1..-1, 2.. ])
/// + v.slice(s![2.. , 1..-1])
/// }
/// # fn main() { }
/// # fn main() { let _ = laplacian; }
/// ```
///
/// # Negative *step*
Expand Down
2 changes: 1 addition & 1 deletion src/zip/mod.rs
Expand Up @@ -184,7 +184,7 @@ trait ZippableTuple: Sized {
///
/// // Example 3: Recreate Example 2 using map_collect to make a new array
///
/// let mut totals2 = Zip::from(a.rows()).map_collect(|row| row.sum());
/// let totals2 = Zip::from(a.rows()).map_collect(|row| row.sum());
///
/// // Check the result against the previous example.
/// assert_eq!(totals, totals2);
Expand Down

0 comments on commit e7600e8

Please sign in to comment.