Skip to content

Commit b36a2e0

Browse files
committed
review
1 parent 2b0c4da commit b36a2e0

File tree

5 files changed

+21
-11
lines changed

5 files changed

+21
-11
lines changed

compiler/rustc_codegen_ssa/src/back/metadata.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ pub(super) fn elf_e_flags(architecture: Architecture, sess: &Session) -> u32 {
404404
/// Mach-O files contain information about:
405405
/// - The platform/OS they were built for (macOS/watchOS/Mac Catalyst/iOS simulator etc).
406406
/// - The minimum OS version / deployment target.
407-
/// - The version of the SDK they were targeting.
407+
/// - The version of the SDK they were targetting.
408408
///
409409
/// In the past, this was accomplished using the LC_VERSION_MIN_MACOSX, LC_VERSION_MIN_IPHONEOS,
410410
/// LC_VERSION_MIN_TVOS or LC_VERSION_MIN_WATCHOS load commands, which each contain information

compiler/rustc_lint_defs/src/builtin.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4353,7 +4353,7 @@ declare_lint! {
43534353

43544354
declare_lint! {
43554355
/// The `refining_impl_trait_reachable` lint detects `impl Trait` return
4356-
/// types in method signatures that are refined by a publicly reachable
4356+
/// types in method signatures that are refined by a publically reachable
43574357
/// trait implementation, meaning the implementation adds information about
43584358
/// the return type that is not present in the trait.
43594359
///

library/std/src/sys_common/mod.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,17 @@ pub trait FromInner<Inner> {
5151
fn from_inner(inner: Inner) -> Self;
5252
}
5353

54-
// Computes (value*numerator)/denom without overflow, as long as both
55-
// (numerator*denom) and the overall result fit into i64 (which is the case
54+
// Computes (value*numer)/denom without overflow, as long as both
55+
// (numer*denom) and the overall result fit into i64 (which is the case
5656
// for our time conversions).
5757
#[allow(dead_code)] // not used on all platforms
58-
pub fn mul_div_u64(value: u64, numerator: u64, denom: u64) -> u64 {
58+
pub fn mul_div_u64(value: u64, numer: u64, denom: u64) -> u64 {
5959
let q = value / denom;
6060
let r = value % denom;
6161
// Decompose value as (value/denom*denom + value%denom),
62-
// substitute into (value*numerator)/denom and simplify.
63-
// r < denom, so (denom*numerator) is the upper bound of (r*numerator)
64-
q * numerator + r * numerator / denom
62+
// substitute into (value*numer)/denom and simplify.
63+
// r < denom, so (denom*numer) is the upper bound of (r*numer)
64+
q * numer + r * numer / denom
6565
}
6666

6767
pub fn ignore_notfound<T>(result: crate::io::Result<T>) -> crate::io::Result<()> {

src/tools/tidy/src/ext_tool_checks.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,18 +228,17 @@ fn check_impl(
228228

229229
if spellcheck_all || spellcheck_fix {
230230
let config_path = root_path.join("typos.toml");
231-
let mut args =
232231
// sync target files with .github/workflows/ci.yml
232+
let mut args =
233233
vec!["-c", config_path.as_os_str().to_str().unwrap(), "./compiler", "./library"];
234234

235235
if spellcheck_all {
236236
eprintln!("spellcheck files");
237-
spellcheck_runner(&args)?;
238237
} else if spellcheck_fix {
239238
eprintln!("spellcheck files and fix");
240239
args.push("--write-changes");
241-
spellcheck_runner(&args)?;
242240
}
241+
spellcheck_runner(&args)?;
243242
}
244243

245244
Ok(())

typos.toml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,18 @@ matcheable = "matcheable"
3434
smove = "smove"
3535
childs = "childs"
3636
filetimes = "filetimes"
37+
misformed = "misformed"
38+
targetting = "targetting"
39+
publically = "publically"
3740

3841
[default.extend-identifiers]
42+
# Entries goes here if typo is part of some existing ident
43+
# where you want to keep it, but don't want to allow
44+
# such typos everywhere.
45+
#
46+
# I.e. you don't want (or can't) fix some constant name, like
47+
# `DNS_ERROR_INVAILD_VIRTUALIZATION_INSTANCE_NAME` but actually
48+
# want to see `INVAILD` typo fixed in other places.
3949
ERROR_FILENAME_EXCED_RANGE = "ERROR_FILENAME_EXCED_RANGE"
4050
DNS_ERROR_INVAILD_VIRTUALIZATION_INSTANCE_NAME = "DNS_ERROR_INVAILD_VIRTUALIZATION_INSTANCE_NAME"
4151
ERROR_DS_FILTER_USES_CONTRUCTED_ATTRS = "ERROR_DS_FILTER_USES_CONTRUCTED_ATTRS"
@@ -44,6 +54,7 @@ ERROR_MCA_OCCURED = "ERROR_MCA_OCCURED"
4454
ERRNO_ACCES = "ERRNO_ACCES"
4555
tolen = "tolen"
4656
pard = "pard"
57+
numer = "numer"
4758

4859
[default]
4960
extend-ignore-words-re = [

0 commit comments

Comments
 (0)