Rename util module to defer

Author: fornwall

src/util.rs renamed to src/defer.rs

@@ -1,17 +1,13 @@
-/*!
-This module just contains other random implementation stuff.
-*/
+//! This module contains an implementation of Defer.
 use log::error;
 use std::error::Error;
 use std::marker::PhantomData;
 
-/**
-Used to defer a closure until the value is dropped.
-
-The closure *must* return a `Result<(), _>`, as a reminder to *not* panic; doing so will abort your whole program if it happens during another panic.  If the closure returns an `Err`, then it is logged as an `error`.
-
-A `Defer` can also be "disarmed", preventing the closure from running at all.
-*/
+/// Used to defer a closure until the value is dropped.
+///
+/// The closure *must* return a `Result<(), _>`, as a reminder to *not* panic; doing so will abort your whole program if it happens during another panic.  If the closure returns an `Err`, then it is logged as an `error`.
+///
+/// A `Defer` can also be "disarmed", preventing the closure from running at all.
 #[must_use]
 pub struct Defer<'a, F, E>(Option<F>, PhantomData<&'a F>)
 where
@@ -23,16 +19,12 @@ where
     F: 'a + FnOnce() -> Result<(), E>,
     E: Error,
 {
-    /**
-    Create a new `Defer` with the given closure.
-    */
+    /// Create a new `Defer` with the given closure.
     pub fn new(f: F) -> Defer<'a, F, E> {
         Defer(Some(f), PhantomData)
     }
 
-    /**
-    Consume this `Defer` *without* invoking the closure.
-    */
+    /// Consume this `Defer` *without* invoking the closure.
     pub fn disarm(mut self) {
         self.0 = None;
         drop(self);

src/main.rs

@@ -3,11 +3,11 @@
 mod arguments;
 mod build_kind;
 mod consts;
+mod defer;
 mod error;
 mod manifest;
 mod platform;
 mod templates;
-mod util;
 
 #[cfg(windows)]
 mod file_assoc;
@@ -27,8 +27,8 @@ use std::path::{Path, PathBuf};
 use std::process::Command;
 
 use crate::build_kind::BuildKind;
+use crate::defer::Defer;
 use crate::error::{MainError, MainResult};
-use crate::util::Defer;
 use sha1::{Digest, Sha1};
 
 fn main() {