Small updates for new versions of rustc and clippy

Author: nicolas-abril

docs/compiler-options.md

@@ -7,7 +7,7 @@
 | `-Oeta` `-Ono-eta`                                                       | Disabled      | [eta-reduction](#eta-reduction)           |
 | `-Oprune` `-Ono-prune`                                                   | Disabled      | [definition-pruning](#definition-pruning) |
 | `-Olinearize-matches` `-Olinearize-matches-alt` `-Ono-linearize-matches` | Enabled       | [linearize-matches](#linearize-matches)   |
-| `-Ofloat_combinators` `-Ono-float_combinators`                           | Enabled       | [float-combinators](#float-combinators)   |
+| `-Ofloat-combinators` `-Ono-float-combinators`                           | Enabled       | [float-combinators](#float-combinators)   |
 | `-Omerge` `-Ono-merge`                                                   | Disabled      | [definition-merging](#definition-merging) |
 | `-Oinline` `-Ono-inline`                                                 | Disabled      | [inline](#inline)                         |
 | `-Ocheck-net-size` `-Ono-check-net-size`                                 | Disabled      | [check-net-size](#check-net-size)         |

src/diagnostics.rs

@@ -372,7 +372,7 @@ impl Display for Diagnostic {
 }
 
 impl Diagnostic {
-  pub fn display_with_origin<'a>(&'a self, origin: &'a DiagnosticOrigin) -> impl std::fmt::Display + '_ {
+  pub fn display_with_origin<'a>(&'a self, origin: &'a DiagnosticOrigin) -> impl std::fmt::Display + 'a {
     DisplayFn(move |f| {
       match origin {
         DiagnosticOrigin::Parsing => writeln!(f, "{self}")?,

src/fun/check/unbound_vars.rs

@@ -34,7 +34,6 @@ impl Ctx<'_> {
 impl Term {
   /// Checks that all variables are bound.
   /// Precondition: References have been resolved, implicit binds have been solved.
-
   pub fn check_unbound_vars<'a>(
     &'a mut self,
     scope: &mut Vec<Option<&'a Name>>,

src/fun/parser.rs

@@ -941,7 +941,7 @@ impl<'a> FunParser<'a> {
   /// Parses a tag where it may or may not be valid.
   ///
   /// If it is not valid, the returned callback can be used to issue an error.
-  fn parse_tag(&mut self) -> ParseResult<(Option<Tag>, impl FnOnce(&mut Self) -> Result<(), ParseError>)> {
+  fn parse_tag(&mut self) -> ParseResult<(Option<Tag>, impl FnOnce(&mut Self) -> ParseResult<()>)> {
     let index = self.index;
     self.skip_trivia();
     let tag = if self.peek_one() == Some('#')

src/fun/term_to_net.rs

@@ -102,7 +102,7 @@ enum Place<'t> {
   Wire(usize),
 }
 
-impl<'t, 'l> EncodeTermState<'t, 'l> {
+impl<'t> EncodeTermState<'t, '_> {
   /// Adds a subterm connected to `up` to the `inet`.
   /// `scope` has the current variable scope.
   /// `vars` has the information of which ports the variables are declared and used in.

src/hvm/prune.rs

@@ -19,7 +19,7 @@ struct PruneState<'a> {
   unvisited: HashSet<String>,
 }
 
-impl<'a> PruneState<'a> {
+impl PruneState<'_> {
   fn visit_def(&mut self, name: &str) {
     if self.unvisited.remove(name) {
       for tree in net_trees(&self.book.defs[name]) {