Skip to content

Commit a9f1e14

Browse files
committed
review
1 parent 9e67118 commit a9f1e14

File tree

6 files changed

+22
-12
lines changed

6 files changed

+22
-12
lines changed

compiler/rustc_codegen_ssa/src/back/metadata.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ pub(crate) fn create_object_file(sess: &Session) -> Option<write::Object<'static
408408
/// Mach-O files contain information about:
409409
/// - The platform/OS they were built for (macOS/watchOS/Mac Catalyst/iOS simulator etc).
410410
/// - The minimum OS version / deployment target.
411-
/// - The version of the SDK they were targeting.
411+
/// - The version of the SDK they were targetting.
412412
///
413413
/// In the past, this was accomplished using the LC_VERSION_MIN_MACOSX, LC_VERSION_MIN_IPHONEOS,
414414
/// LC_VERSION_MIN_TVOS or LC_VERSION_MIN_WATCHOS load commands, which each contain information

compiler/rustc_errors/src/tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ fn wellformed_fluent() {
9797
}
9898

9999
#[test]
100-
fn malformed_fluent() {
100+
fn misformed_fluent() {
101101
let dummy = make_dummy("mir_build_borrow_of_moved_value = borrow of moved value
102102
.label = value moved into `{name}` here
103103
.occurs_because_label = move occurs because `{$oops}` has type `{$ty}` which does not implement the `Copy` trait

compiler/rustc_lint_defs/src/builtin.rs

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

44444444
declare_lint! {
44454445
/// The `refining_impl_trait_reachable` lint detects `impl Trait` return
4446-
/// types in method signatures that are refined by a publicly reachable
4446+
/// types in method signatures that are refined by a publically reachable
44474447
/// trait implementation, meaning the implementation adds information about
44484448
/// the return type that is not present in the trait.
44494449
///

library/std/src/sys_common/mod.rs

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

71-
// Computes (value*numerator)/denom without overflow, as long as both
72-
// (numerator*denom) and the overall result fit into i64 (which is the case
71+
// Computes (value*numer)/denom without overflow, as long as both
72+
// (numer*denom) and the overall result fit into i64 (which is the case
7373
// for our time conversions).
7474
#[allow(dead_code)] // not used on all platforms
75-
pub fn mul_div_u64(value: u64, numerator: u64, denom: u64) -> u64 {
75+
pub fn mul_div_u64(value: u64, numer: u64, denom: u64) -> u64 {
7676
let q = value / denom;
7777
let r = value % denom;
7878
// Decompose value as (value/denom*denom + value%denom),
79-
// substitute into (value*numerator)/denom and simplify.
80-
// r < denom, so (denom*numerator) is the upper bound of (r*numerator)
81-
q * numerator + r * numerator / denom
79+
// substitute into (value*numer)/denom and simplify.
80+
// r < denom, so (denom*numer) is the upper bound of (r*numer)
81+
q * numer + r * numer / denom
8282
}
8383

8484
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
@@ -248,18 +248,17 @@ fn check_impl(
248248

249249
if spellcheck_all || spellcheck_fix {
250250
let config_path = root_path.join("typos.toml");
251-
let mut args =
252251
// sync target files with .github/workflows/ci.yml
252+
let mut args =
253253
vec!["-c", config_path.as_os_str().to_str().unwrap(), "./compiler", "./library"];
254254

255255
if spellcheck_all {
256256
eprintln!("spellcheck files");
257-
spellcheck_runner(&args)?;
258257
} else if spellcheck_fix {
259258
eprintln!("spellcheck files and fix");
260259
args.push("--write-changes");
261-
spellcheck_runner(&args)?;
262260
}
261+
spellcheck_runner(&args)?;
263262
}
264263

265264
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)