Merge pull request #2332 from mulkieran/develop-2.2.1-rust-1.48

Increase recommended development toolchain to 1.48.0

Author: mulkieran

.github/workflows/main.yml

@@ -22,10 +22,10 @@ jobs:
         include:
           # MANDATORY CHECKS USING CURRENT DEVELOPMENT COMPILER
           - task: make -f Makefile fmt-travis
-            toolchain: 1.47.0
+            toolchain: 1.48.0
             components: rustfmt
           - task: make -f Makefile clippy
-            toolchain: 1.47.0
+            toolchain: 1.48.0
             components: clippy
           # MANDATORY TESTING ON STABLE
           - task: make -f Makefile build

Makefile

@@ -10,6 +10,7 @@ DENY = -D warnings -D future-incompatible -D unused ${RUST_2018_IDIOMS}
 
 # Clippy deny variable, including allows for troublesome lints.
 # Notable allows:
+# map_err_ignore: we generally drop the errors for a reason
 # option_if_let_else: causing problems with if-else chains
 # similar_names: judges "yes" and "res" to be too similar
 CLIPPY_DENY = -D clippy::pedantic \
@@ -23,6 +24,7 @@ CLIPPY_DENY = -D clippy::pedantic \
               -A clippy::find_map \
               -A clippy::if_not_else \
               -A clippy::items_after_statements \
+              -A clippy::map_err_ignore \
               -A clippy::map_unwrap_or \
               -A clippy::match_same_arms \
               -A clippy::match_wildcard_for_single_variants \

README.md

@@ -47,7 +47,7 @@ mailing list, if preferred.
 ### Setting up for development
 
 #### Development Compiler
-The version of the compiler recommended for development is 1.47. Other
+The version of the compiler recommended for development is 1.48. Other
 versions of the compiler may disagree with the CI tasks on some points,
 so should be avoided.
 

src/engine/types/mod.rs

@@ -87,6 +87,7 @@ pub enum Redundancy {
 }
 
 #[derive(Debug, PartialEq, Eq, Hash, Clone)]
+#[allow(clippy::rc_buffer)]
 pub struct Name(Rc<String>);
 
 impl Name {