SourceFile::into_directive() doesn't need a failure result.

Also enable the unnecessary_wraps Clippy warning now that the code
doesn't produce those.

Author: youngman-g

assembler/src/asmlib/driver.rs

@@ -394,7 +394,7 @@ fn assemble_pass2<'s>(
         }
     }
 
-    let directive = source_file.into_directive(&memory_map)?;
+    let directive = source_file.into_directive(&memory_map);
     if let Some(instruction_count) = directive
         .blocks
         .values()

assembler/src/asmlib/lexer.rs

@@ -247,6 +247,7 @@ impl Display for Token {
                 write!(f, "{q_string}{dotname}{bit_string}")
             }
             Token::SymexSyllable(script, name) => {
+                #[allow(clippy::unnecessary_wraps)]
                 fn nochange(ch: char) -> Result<char, ()> {
                     Ok(ch)
                 }

assembler/src/asmlib/lib.rs

@@ -12,6 +12,7 @@
 #![warn(clippy::items_after_statements)]
 #![warn(clippy::explicit_iter_loop)]
 #![warn(clippy::unreadable_literal)]
+#![warn(clippy::redundant_closure_for_method_calls)]
 #![warn(clippy::pedantic)]
 #![allow(clippy::enum_glob_use)] // fix later
 #![allow(clippy::redundant_else)] // fix later
@@ -25,8 +26,7 @@
 #![allow(clippy::doc_markdown)] // fix soon
 #![allow(clippy::match_wildcard_for_single_variants)] // fix soon
 #![allow(clippy::trivially_copy_pass_by_ref)] // fix soon
-#![allow(clippy::unnecessary_wraps)] // fix soon
-#![warn(clippy::redundant_closure_for_method_calls)]
+#![warn(clippy::unnecessary_wraps)] // fix soon
 
 mod ast;
 mod collections;

assembler/src/asmlib/manuscript.rs

@@ -44,7 +44,6 @@ use super::symtab::ExplicitDefinition;
 use super::symtab::ExplicitSymbolTable;
 #[cfg(test)]
 use super::symtab::TagDefinition;
-use super::types::AssemblerFailure;
 use super::types::BlockIdentifier;
 
 fn offset_to_block_id<T>((offset, item): (usize, T)) -> (BlockIdentifier, T) {
@@ -148,7 +147,7 @@ impl SourceFile {
         self.symbol_uses().filter_map(definitions_only)
     }
 
-    pub(crate) fn into_directive(self, mem_map: &MemoryMap) -> Result<Directive, AssemblerFailure> {
+    pub(crate) fn into_directive(self, mem_map: &MemoryMap) -> Directive {
         let SourceFile {
             punch,
             blocks: input_blocks,
@@ -211,7 +210,7 @@ impl SourceFile {
         // answers for right now.  For example, should the
         // existing program be cleared?  Should the symbol
         // table be cleared?
-        Ok(Directive::new(output_blocks, equalities, entry_point))
+        Directive::new(output_blocks, equalities, entry_point)
     }
 }