Skip to content

Commit

Permalink
Merge branch 'master' into josh/default
Browse files Browse the repository at this point in the history
  • Loading branch information
JoshuaBatty authored Jun 18, 2024
2 parents 5e2e033 + 9d8ae92 commit 381f2f2
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/src/basics.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fuelup toolchain install latest
The Fuel toolchain is distributed on one [release channel]: latest (with nightly being a WIP).
`fuelup` uses the `latest` channel by default, which represents the latest stable release of the Fuel toolchain.

When new versions of the components within an distributable Fuel toolchain (`latest` or `nightly`)
When new versions of the components within a distributable Fuel toolchain (`latest` or `nightly`)
are released, simply type `fuelup update` to update:

<!-- This section should show the command to update distributable toolchains -->
Expand Down
2 changes: 1 addition & 1 deletion docs/src/developer_guide/index.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Developer Guide

This section serves as a guide for people who are interested on working on and contributing to `fuelup`.
This section serves as a guide for people who are interested in working on and contributing to `fuelup`.

If you simply wish to use `fuelup`, you may ignore this section.

Expand Down
2 changes: 1 addition & 1 deletion src/download.rs
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ pub fn download(url: &str) -> Result<Vec<u8>> {
return Ok(data);
}
Err(ureq::Error::Status(404, r)) => {
// We've reached download_file stage, which means the tag must be correct.
// We've reached the download_file stage, which means the tag must be correct.
error!("Failed to download from {}", &url);
let retry: Option<u64> = r.header("retry-after").and_then(|h| h.parse().ok());
let retry = retry.unwrap_or(RETRY_DELAY_SECS);
Expand Down
2 changes: 1 addition & 1 deletion src/toolchain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ fn extract_target(parts: &mut VecDeque<&str>) -> Option<TargetTriple> {
/// <channel>-<YYYY-MM-DD>
/// <channel>-<YYYY-MM-DD>-<target>
/// <channel>-<target>-<YYYY-MM-DD>
/// The parsing begings from the end of the string, so the target is the last part of the string,
/// The parsing begins from the end of the string, so the target is the last part of the string,
/// then the date and finally the name
impl FromStr for DistToolchainDescription {
type Err = anyhow::Error;
Expand Down

0 comments on commit 381f2f2

Please sign in to comment.