Merge pull request #861 from petertseng/warn

decimal, isbn-verifier, react, rectangles: Heed Rust 1.37.0 warnings
exercism · Aug 28, 2019 · 62a872c · 62a872c
2 parents 7c2ee05 + f737a77
commit 62a872c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/exercises/decimal/example.rs b/exercises/decimal/example.rs
@@ -39,7 +39,7 @@ impl Decimal {
         let mut decimal_index = None;
         for ch in input.chars() {
             match ch {
-                '0'...'9' | '-' | '+' => {
+                '0'..='9' | '-' | '+' => {
                     digits.push(ch);
                     if let Some(idx) = decimal_index.as_mut() {
                         *idx += 1;

diff --git a/exercises/isbn-verifier/example.rs b/exercises/isbn-verifier/example.rs
@@ -29,7 +29,7 @@ pub fn is_valid_isbn(isbn: &str) -> bool {
     let mut coefficient = 10;
     for (position, c) in isbn.char_indices() {
         let digit_value = match c {
-            '0'...'9' => c.to_digit(10).unwrap(),
+            '0'..='9' => c.to_digit(10).unwrap(),
             'X' if is_X_valid(&position, &isbn_type) => 10,
             '-' if is_dash_valid(&position, &isbn_type) => continue,
             _ => return false,

diff --git a/exercises/react/example.rs b/exercises/react/example.rs
@@ -44,9 +44,9 @@ struct ComputeCell<'a, T: Copy> {
     cell: Cell<T>,
 
     dependencies: Vec<CellID>,
-    f: Box<Fn(&[T]) -> T + 'a>,
+    f: Box<dyn Fn(&[T]) -> T + 'a>,
     callbacks_issued: usize,
-    callbacks: HashMap<CallbackID, Box<FnMut(T) -> () + 'a>>,
+    callbacks: HashMap<CallbackID, Box<dyn FnMut(T) -> () + 'a>>,
 }
 
 impl<T: Copy> Cell<T> {

diff --git a/exercises/rectangles/example.rs b/exercises/rectangles/example.rs
@@ -132,7 +132,7 @@ pub fn count(lines: &[&str]) -> usize {
     total
 }
 
-fn scan_connected(area: &Area) -> Connections {
+fn scan_connected(area: &dyn Area) -> Connections {
     let mut conns = Connections{
         lines: HashSet::new(),
         points: HashMap::new()