Skip to content

Commit

Permalink
Unrolled build for rust-lang#134922
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#134922 - ericlehong:fix/typos, r=lqd

Fix typos

This PR fixes typos errors in comments, docs and logs.

Thank you very much.
  • Loading branch information
rust-timer authored Dec 30, 2024
2 parents 2061630 + a0b3452 commit b451a51
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/etc/test-float-parse/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
These are tests designed to test decimal to float conversions (`dec2flt`) used
by the standard library.

It consistes of a collection of test generators that each generate a set of
It consists of a collection of test generators that each generate a set of
patterns intended to test a specific property. In addition, there are exhaustive
tests (for <= `f32`) and fuzzers (for anything that can't be run exhaustively).

Expand Down
8 changes: 4 additions & 4 deletions src/etc/test-float-parse/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const DEFAULT_MAX_FAILURES: u64 = 20;
/// Register exhaustive tests only for <= 32 bits. No more because it would take years.
const MAX_BITS_FOR_EXHAUUSTIVE: u32 = 32;

/// If there are more tests than this threashold, the test will be defered until after all
/// If there are more tests than this threshold, the test will be deferred until after all
/// others run (so as to avoid thread pool starvation). They also can be excluded with
/// `--skip-huge`.
const HUGE_TEST_CUTOFF: u64 = 5_000_000;
Expand Down Expand Up @@ -109,7 +109,7 @@ pub fn run(cfg: Config, include: &[String], exclude: &[String]) -> ExitCode {
ui::finish(&tests, elapsed, &cfg)
}

/// Enumerate tests to run but don't actaully run them.
/// Enumerate tests to run but don't actually run them.
pub fn register_tests(cfg: &Config) -> Vec<TestInfo> {
let mut tests = Vec::new();

Expand All @@ -120,7 +120,7 @@ pub fn register_tests(cfg: &Config) -> Vec<TestInfo> {
tests.sort_unstable_by_key(|t| (t.float_name, t.gen_name));
for i in 0..(tests.len() - 1) {
if tests[i].gen_name == tests[i + 1].gen_name {
panic!("dupliate test name {}", tests[i].gen_name);
panic!("duplicate test name {}", tests[i].gen_name);
}
}

Expand Down Expand Up @@ -295,7 +295,7 @@ enum Update {
fail: CheckFailure,
/// String for which parsing was attempted.
input: Box<str>,
/// The parsed & decomposed `FloatRes`, aleady stringified so we don't need generics here.
/// The parsed & decomposed `FloatRes`, already stringified so we don't need generics here.
float_res: Box<str>,
},
/// Exited with an unexpected condition.
Expand Down
2 changes: 1 addition & 1 deletion src/tools/suggest-tests/src/static_suggestions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use std::sync::OnceLock;

use crate::{Suggestion, sug};

// FIXME: perhaps this could use `std::lazy` when it is stablizied
// FIXME: perhaps this could use `std::lazy` when it is stabilized
macro_rules! static_suggestions {
($( [ $( $glob:expr ),* $(,)? ] => [ $( $suggestion:expr ),* $(,)? ] ),* $(,)? ) => {
pub(crate) fn static_suggestions() -> &'static [(Vec<&'static str>, Vec<Suggestion>)]
Expand Down

0 comments on commit b451a51

Please sign in to comment.