Skip to content

Commit

Permalink
Merge pull request #89 from Fractal-Tess/master
Browse files Browse the repository at this point in the history
Typo correction
  • Loading branch information
phil-opp authored Nov 7, 2022
2 parents 24a3b10 + 3cd7e17 commit 63b52fe
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions src/builder/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pub enum BuildKernelError {
Io {
/// Desciption of the failed I/O operation
message: &'static str,
/// The I/O error that occured
/// The I/O error that occurred
error: io::Error,
},

Expand Down Expand Up @@ -49,7 +49,7 @@ pub enum BuildKernelError {
#[non_exhaustive]
pub enum CreateBootimageError {
/// Failed to build the bootloader.
#[error("An error occured while trying to build the bootloader: {0}")]
#[error("An error occurred while trying to build the bootloader: {0}")]
Bootloader(#[from] BootloaderError),

/// Error while running `cargo metadata`
Expand All @@ -64,15 +64,15 @@ pub enum CreateBootimageError {
},

/// Disk image creation failed
#[error("An error occured while trying to create the disk image: {0}")]
#[error("An error occurred while trying to create the disk image: {0}")]
DiskImage(#[from] DiskImageError),

/// An unexpected I/O error occurred
#[error("I/O error: {message}:\n{error}")]
Io {
/// Desciption of the failed I/O operation
message: &'static str,
/// The I/O error that occured
/// The I/O error that occurred
error: io::Error,
},

Expand Down Expand Up @@ -145,7 +145,7 @@ pub enum DiskImageError {
Io {
/// Desciption of the failed I/O operation
message: &'static str,
/// The I/O error that occured
/// The I/O error that occurred
error: io::Error,
},
}
Expand Down
8 changes: 4 additions & 4 deletions src/run.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,17 +101,17 @@ pub enum RunError {
#[error("Failed to read QEMU exit code")]
NoQemuExitCode,

/// An I/O error occured
#[error("{context}: An I/O error occured: {error}")]
/// An I/O error occurred
#[error("{context}: An I/O error occurred: {error}")]
Io {
/// The operation that caused the I/O error.
context: IoErrorContext,
/// The I/O error that occured.
/// The I/O error that occurred.
error: io::Error,
},
}

/// An I/O error occured while trying to run the disk image.
/// An I/O error occurred while trying to run the disk image.
#[derive(Debug, Error)]
pub enum IoErrorContext {
/// QEMU command for non-test failed
Expand Down

0 comments on commit 63b52fe

Please sign in to comment.