Spelling #110392

jsoref · 2023-04-16T07:27:12Z

This PR corrects misspellings identified by the check-spelling action.

The misspellings have been reported at https://github.com/jsoref/rust/actions/runs/4712066890#summary-12779316921

The action reports that the changes in this PR would make it happy: https://github.com/jsoref/rust/actions/runs/4712067124#summary-12779317247

Signed-off-by: Josh Soref <[email protected]>

fee1-dead · 2023-04-16T07:33:49Z

This PR is pretty big.. Would it be easy to split these changes into smaller PRs?

rust-log-analyzer · 2023-04-16T07:35:16Z

The job mingw-check-tidy failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

Prepare all required actions
Getting action download info
Download action repository 'actions/checkout@v3' (SHA:8e5e7e5ab8b370d6c329ec480221332ada57f0ab)
Download action repository 'rust-lang/simpleinfra@master' (SHA:75291a2cdf0dd5ba60860701274f9500703102da)
Complete job name: PR - mingw-check-tidy
git config --global core.autocrlf false
shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0}
env:
  CI_JOB_NAME: mingw-check-tidy
---
Building wheels for collected packages: reuse
  Building wheel for reuse (pyproject.toml): started
  Building wheel for reuse (pyproject.toml): finished with status 'done'
  Created wheel for reuse: filename=reuse-1.1.0-cp310-cp310-manylinux_2_35_x86_64.whl size=180119 sha256=9fa76c45f3193f307e02ea67d1a48cfe7ef2b854a074b766938a88e046bc7887
  Stored in directory: /tmp/pip-ephem-wheel-cache-rb6hhi72/wheels/c2/3c/b9/1120c2ab4bd82694f7e6f0537dc5b9a085c13e2c69a8d0c76d
Installing collected packages: boolean-py, binaryornot, setuptools, reuse, python-debian, markupsafe, license-expression, jinja2, chardet
  Attempting uninstall: setuptools
    Found existing installation: setuptools 59.6.0
    Not uninstalling setuptools at /usr/lib/python3/dist-packages, outside environment /usr
---
Successfully built 8d3b8053a08e
Successfully tagged rust-ci:latest
Built container sha256:8d3b8053a08e7a2064b223cf26cd44f65561528b4a49fd6c6da87fec1a737891
Uploading finished image to https://ci-caches.rust-lang.org/docker/eee721fc1ad06e35509f22d2087fb4acdb0a4d378bec3a191179769e2503f17c7f8f4292d7013976df3a24502e822c590708d80a62f327ca4849564995e4deb7
upload failed: - to s3://rust-lang-ci-sccache2/docker/eee721fc1ad06e35509f22d2087fb4acdb0a4d378bec3a191179769e2503f17c7f8f4292d7013976df3a24502e822c590708d80a62f327ca4849564995e4deb7 Unable to locate credentials
[CI_JOB_NAME=mingw-check-tidy]
[CI_JOB_NAME=mingw-check-tidy]
---
   Compiling cargo_metadata v0.15.3
   Compiling tidy v0.1.0 (/checkout/src/tools/tidy)
    Finished release [optimized] target(s) in 13.67s
fmt check
Diff in /checkout/compiler/rustc_infer/src/infer/error_reporting/need_type_info.rs at line 1:
 use crate::errors::{
-    AmbiguousReturn, AmbiguousImpl, AnnotationRequired, InferenceBadError, NeedTypeInfoInGenerator,
+    AmbiguousImpl, AmbiguousReturn, AnnotationRequired, InferenceBadError, NeedTypeInfoInGenerator,
     SourceKindMultiSuggestion, SourceKindSubdiag,
 };
 use crate::infer::error_reporting::TypeErrCtxt;
Running `"/checkout/obj/build/x86_64-unknown-linux-gnu/rustfmt/bin/rustfmt" "--config-path" "/checkout" "--edition" "2021" "--unstable-features" "--skip-children" "--check" "/checkout/compiler/rustc_infer/src/infer/error_reporting/need_type_info.rs" "/checkout/compiler/rustc_infer/src/infer/error_reporting/suggest.rs" "/checkout/compiler/rustc_infer/src/infer/error_reporting/note_and_explain.rs" "/checkout/compiler/rustc_infer/src/infer/free_regions.rs" "/checkout/compiler/rustc_infer/src/infer/lub.rs" "/checkout/compiler/rustc_infer/src/infer/equate.rs" "/checkout/compiler/rustc_infer/src/infer/lattice.rs" "/checkout/compiler/rustc_infer/src/infer/error_reporting/mod.rs"` failed.
If you're running `tidy`, try again with `--bless`. Or, if you just want to format code, run `./x.py fmt` instead.

Noratrieb · 2023-04-16T07:46:17Z

You should also squash the commits afterward the splitting up (the best way to split it up is probably after specific areas (compiler, library, rustdoc etc). With the tests you should be careful and maybe avoid them for now to not accidentally make the test wrong. Changes to rustc_codegen_gcc, rustc_codegen_cranelift, clippy, cargo and rustfmt should be filed on their respective repositories instead of here.

compiler-errors · 2023-04-16T07:46:30Z

There are several problems with this PR:

First of all, it's somewhat disruptive to the github history and to reviewability that this is broken into one commit per word. Even if we were to review this, it's much easier to break this into smaller PRs centered around fixing certain areas of the codebase (e.g. per crate in compiler/, fixing typos in rustdoc, libstd docs, etc.).
Secondly, this touches crates that are "in limbo" and other sources that really shouldn't be modified in tree unless for a good reason. For example, rustc-apfloat shouldn't be modified. Nor is it a good idea to touch tools that have their own repos, like src/tools/rustfmt.
Third, it's not very valuable IMO to be "fixing" UI tests. Those are test data, it doesn't matter if they have small typos in them. From a quick glance, a lot of the fixes are to those...

Per #58619 and precedent for large "typo fixes" PRs, I'm going to close this. Thanks for your contribution to rustc.

fee1-dead · 2023-04-16T07:49:36Z

it's not very valuable IMO to be "fixing" UI tests.

I assume that typo fixing was automated using a tool, and I'd have no problem with typos being fixed for ui tests. I totally agree that it should be split into different subfolders only (compiler/*, library/*)

On another note, we can have bors squash the commits before merging so having each commit for each word is not a really big problem (except for being hard to navigate as a reviewer because I would have to click on each commit to see the changes).

jsoref · 2023-04-16T08:00:53Z

I split off the components that were listed as subtrees (Spelling miri#2843, Spelling rust-analyzer#14577, Spelling rustfmt#5753 (comment), Spelling rust-clippy#10649)
- I tried to peel off rustfmt and friends, apparently when I did my last round of rebasing/fixups some slipped in.
I'm happy to split things in whichever means people like -- I just need input
I'm happy to squash, but only once people are ok w/ the changes -- if I had squashed eagerly, it'd have been unusable (I rely on unsquashed changes to enable me to drop / fix up items, or while rebasing to deal w/ conflicts)
sorry for not commenting sooner, I'm still working on annotating the PR. I can either flush that or discard it.
I'm quite happy to let bors do the squashing
I assume that typo fixing was automated using a tool -- sort of: an automated tool identifies possible issues. A human (that's me) manually applies changes and I try to make sure that I apply them to everything (while also trying not to apply them to things I've decided to exclude)

jsoref

I won't finish the annotations, but here's what I had when I stopped...

jsoref · 2023-04-16T07:27:53Z

RELEASES.md

Some projects don't like changing changelogs. Happy to drop.

jsoref · 2023-04-16T07:28:27Z

compiler/rustc_apfloat/src/ieee.rs

-        // poision "2*precision - 1" to "precision - 1". The exponent need to be
+        // poisson "2*precision - 1" to "precision - 1". The exponent need to be


jsoref · 2023-04-16T07:29:27Z

compiler/rustc_codegen_cranelift/Readme.md

-Alternatively you can download a pre built version from [Github Actions]. It is listed in the artifacts section
+Alternatively you can download a pre built version from [GitHub Actions]. It is listed in the artifacts section


jsoref · 2023-04-16T07:31:48Z

compiler/rustc_codegen_llvm/src/lib.rs

-// The following is a work around that replaces `pub mod llvm;` and that fixes issue 53912.
+// The following is a workaround that replaces `pub mod llvm;` and that fixes issue 53912.


the noun form is a single word.

jsoref · 2023-04-16T07:36:49Z

compiler/rustc_feature/src/removed.rs

-    /// A way to temporarily opt out of opt in copy. This will *never* be accepted.
+    /// A way to temporarily opt out of opt-in copy. This will *never* be accepted.


nouns compound with either - or without a space, verb phrases don't compound. Here, opt out is a verb phrase, whereas opt-in is the noun.

jsoref · 2023-04-16T07:37:50Z

compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs

-        // get all where BoundPredicates here, because they are used in to cases below
+        // get all where BoundPredicates here, because they are used in two cases below


In general, I do not check 2-letter words. Here, in to tripped a check and it appears that to was the wrong homonym.

jsoref · 2023-04-16T07:38:50Z

compiler/rustc_incremental/src/persist/dirty_clean.rs

-    // can't add `#[rustc_clean]` etc without opting in to this feature
+    // can't add `#[rustc_clean]` etc without opting into this feature


I should note that in to/into changes to be quite controversial. I'm happy to drop them (or anything else).

jsoref · 2023-04-16T07:39:19Z

compiler/rustc_infer/messages.ftl

-infer_prlf_must_oultive_with_sup = ...must outlive the lifetime `{$sup_symbol}` defined here
-infer_prlf_must_oultive_without_sup = ...must outlive the lifetime defined here
+infer_prlf_must_outlive_with_sup = ...must outlive the lifetime `{$sup_symbol}` defined here
+infer_prlf_must_outlive_without_sup = ...must outlive the lifetime defined here


-oultive +outlive

jsoref · 2023-04-16T07:39:52Z

compiler/rustc_infer/messages.ftl

-infer_oc_intristic_correct_type = intrinsic has wrong type
+infer_oc_intrinsic_correct_type = intrinsic has wrong type


-intristic +intrinsic

jsoref · 2023-04-16T07:40:28Z

compiler/rustc_infer/src/infer/canonical/query_response.rs

-                    if let ty::ConstKind::Bound(debrujin, b) = result_value.kind() {
+                    if let ty::ConstKind::Bound(debruijn, b) = result_value.kind() {


These two tokens were adjacent in the word list and one appeared dominant.

workingjubilee · 2023-04-16T08:03:44Z

Sorry, we cannot actually rely on bors to do squashing.

jsoref · 2023-04-16T08:08:04Z

I'm quite happy to do the squashing, can someone suggest a limited subset of directories they'd like me to start w/?

I'm fully capable of doing splits and squashes, but I do need direction.

If there's a specific set of directories I should absolutely ignore, I can take that now and drop changes to them.

Noratrieb · 2023-04-16T08:44:19Z

rustc_apfloat needs to be ignored. I'd recommend splitting as I described above. You can r? Nilstrieb on the compiler PR.

fee1-dead · 2023-04-16T09:06:00Z

Sorry, we cannot actually rely on bors to do squashing.

Yeah.. sorry for forgetting about that.

…iddle Spelling librustdoc This is split from rust-lang#110392 There's one change to src/tools/rustdoc-gui/tester.js which feels like a reasonable thing to piggy-back here.

Spelling compiler This is per rust-lang#110392 (comment) I'm going to delay performing a squash because I really don't expect people to be perfectly happy w/ my changes, I really am a human and I really do make mistakes. r? Nilstrieb I'm going to be flying this evening, but I should be able to squash / respond to reviews w/in a day or two. I tried to be careful about dropping changes to `tests`, afaict only two files had changes that were likely related to the changes for a given commit (this is where not having eagerly squashed should have given me an advantage), but, that said, picking things apart can be error prone.

…lbertlarsan68 Spelling src bootstrap The various src/* items seem slightly disparate, so I'm doing src/* individually. split from rust-lang#110392

…rsan68 Spelling src ci The various src/* items seem slightly disparate, so I'm doing src/* individually. split from rust-lang#110392

…lacrum Spelling src etc The various src/* items seem slightly disparate, so I'm doing src/* individually. split from rust-lang#110392

Spelling src etc The various src/* items seem slightly disparate, so I'm doing src/* individually. split from rust-lang/rust#110392

Spelling rustdoc Split per rust-lang#110392 (comment)

Spelling library Split per rust-lang#110392 I can squash once people are happy w/ the changes. It's really uncommon for large sets of changes to be perfectly acceptable w/o at least some changes. I probably won't have time to respond until tomorrow or the next day

Spelling library Split per rust-lang/rust#110392 I can squash once people are happy w/ the changes. It's really uncommon for large sets of changes to be perfectly acceptable w/o at least some changes. I probably won't have time to respond until tomorrow or the next day

jsoref added 30 commits April 16, 2023 01:08

spelling: certainly

6fd4fe7

Signed-off-by: Josh Soref <[email protected]>

spelling: character

3a66aab

Signed-off-by: Josh Soref <[email protected]>

spelling: clarification

aa36295

Signed-off-by: Josh Soref <[email protected]>

spelling: classified

24c8ac5

Signed-off-by: Josh Soref <[email protected]>

spelling: clause

baafacb

Signed-off-by: Josh Soref <[email protected]>

spelling: closure

fe9b3d2

Signed-off-by: Josh Soref <[email protected]>

spelling: codegen

2874d2c

Signed-off-by: Josh Soref <[email protected]>

spelling: collected

e211dea

Signed-off-by: Josh Soref <[email protected]>

spelling: comment

327a5b5

Signed-off-by: Josh Soref <[email protected]>

spelling: compound

befc7f0

Signed-off-by: Josh Soref <[email protected]>

spelling: conceptually

fd18c33

Signed-off-by: Josh Soref <[email protected]>

spelling: config

f57630c

Signed-off-by: Josh Soref <[email protected]>

spelling: configures

0b250bc

Signed-off-by: Josh Soref <[email protected]>

spelling: considered

47c0c46

Signed-off-by: Josh Soref <[email protected]>

spelling: constituent

4bcb530

Signed-off-by: Josh Soref <[email protected]>

spelling: constraint

1d979d5

Signed-off-by: Josh Soref <[email protected]>

spelling: constraints

33089e4

Signed-off-by: Josh Soref <[email protected]>

spelling: consts

cc9579f

Signed-off-by: Josh Soref <[email protected]>

spelling: contains

1eaa354

Signed-off-by: Josh Soref <[email protected]>

spelling: contravariant

9caf766

Signed-off-by: Josh Soref <[email protected]>

spelling: convenience

a5403fa

Signed-off-by: Josh Soref <[email protected]>

spelling: correct

cca99c4

Signed-off-by: Josh Soref <[email protected]>

spelling: correspondence

7c4b824

Signed-off-by: Josh Soref <[email protected]>

spelling: corresponds

d97a4c6

Signed-off-by: Josh Soref <[email protected]>

spelling: crate

12f7b4c

Signed-off-by: Josh Soref <[email protected]>

spelling: debruijn

6a68535

Signed-off-by: Josh Soref <[email protected]>

spelling: debug

8eaf5c6

Signed-off-by: Josh Soref <[email protected]>

spelling: debugable

2029a05

Signed-off-by: Josh Soref <[email protected]>

spelling: debuggable

08b8db3

Signed-off-by: Josh Soref <[email protected]>

spelling: debugger

d72adcf

Signed-off-by: Josh Soref <[email protected]>

compiler-errors closed this Apr 16, 2023

jsoref commented Apr 16, 2023

View reviewed changes

Mark-Simulacrum mentioned this pull request Apr 19, 2023

Spelling misc #110424

Merged

jyn514 added a commit to jyn514/rust that referenced this pull request Apr 26, 2023

Rollup merge of rust-lang#110418 - jsoref:spelling-rustdoc, r=jyn514

3163dfd

Spelling rustdoc Split per rust-lang#110392 (comment)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Spelling #110392

Spelling #110392

jsoref commented Apr 16, 2023

fee1-dead commented Apr 16, 2023

rust-log-analyzer commented Apr 16, 2023

Noratrieb commented Apr 16, 2023

compiler-errors commented Apr 16, 2023

fee1-dead commented Apr 16, 2023 •

edited

Loading

jsoref commented Apr 16, 2023

jsoref left a comment

jsoref Apr 16, 2023

jsoref Apr 16, 2023

jsoref Apr 16, 2023

jsoref Apr 16, 2023

jsoref Apr 16, 2023

jsoref Apr 16, 2023

jsoref Apr 16, 2023

jsoref Apr 16, 2023

jsoref Apr 16, 2023

jsoref Apr 16, 2023

workingjubilee commented Apr 16, 2023

jsoref commented Apr 16, 2023

Noratrieb commented Apr 16, 2023

fee1-dead commented Apr 16, 2023

		// poision "2*precision - 1" to "precision - 1". The exponent need to be
		// poisson "2*precision - 1" to "precision - 1". The exponent need to be

		Alternatively you can download a pre built version from [Github Actions]. It is listed in the artifacts section
		Alternatively you can download a pre built version from [GitHub Actions]. It is listed in the artifacts section

		// The following is a work around that replaces `pub mod llvm;` and that fixes issue 53912.
		// The following is a workaround that replaces `pub mod llvm;` and that fixes issue 53912.

		/// A way to temporarily opt out of opt in copy. This will never be accepted.
		/// A way to temporarily opt out of opt-in copy. This will never be accepted.

		// get all where BoundPredicates here, because they are used in to cases below
		// get all where BoundPredicates here, because they are used in two cases below

		// can't add `#[rustc_clean]` etc without opting in to this feature
		// can't add `#[rustc_clean]` etc without opting into this feature

		infer_oc_intristic_correct_type = intrinsic has wrong type
		infer_oc_intrinsic_correct_type = intrinsic has wrong type

		if let ty::ConstKind::Bound(debrujin, b) = result_value.kind() {
		if let ty::ConstKind::Bound(debruijn, b) = result_value.kind() {

Spelling #110392

Spelling #110392

Conversation

jsoref commented Apr 16, 2023

fee1-dead commented Apr 16, 2023

rust-log-analyzer commented Apr 16, 2023

Noratrieb commented Apr 16, 2023

compiler-errors commented Apr 16, 2023

fee1-dead commented Apr 16, 2023 • edited Loading

jsoref commented Apr 16, 2023

jsoref left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

workingjubilee commented Apr 16, 2023

jsoref commented Apr 16, 2023

Noratrieb commented Apr 16, 2023

fee1-dead commented Apr 16, 2023

fee1-dead commented Apr 16, 2023 •

edited

Loading