Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Spelling compiler #110417

Merged
merged 1 commit into from
Apr 18, 2023
Merged

Spelling compiler #110417

merged 1 commit into from
Apr 18, 2023

Conversation

jsoref
Copy link
Contributor

@jsoref jsoref commented Apr 16, 2023

This is per #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.

@rustbot
Copy link
Collaborator

rustbot commented Apr 16, 2023

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Nilstrieb (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Apr 16, 2023
@rustbot
Copy link
Collaborator

rustbot commented Apr 16, 2023

This PR changes MIR

cc @oli-obk, @RalfJung, @JakobDegen, @davidtwco, @celinval, @vakaras

Some changes occurred in abstract_const.rs

cc @BoxyUwU

Some changes occurred in need_type_info.rs

cc @lcnr

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred in const_evaluatable.rs

cc @BoxyUwU

Changes rustc_apfloat. rustc_apfloat is currently in limbo and you almost certainly don't want to change it (see #55993).

cc @eddyb

These commits modify compiler targets.
(See the Target Tier Policy.)

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

@Noratrieb
Copy link
Member

I will review this once CI passes. Looks like some functions got renamed but not everywhere.
@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 16, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
jsoref
jsoref commented Apr 16, 2023
View reviewed changes
compiler/rustc_apfloat/src/ieee.rs Outdated Show resolved Hide resolved
compiler/rustc_ast_passes/messages.ftl Show resolved Hide resolved
compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs Show resolved Hide resolved
compiler/rustc_codegen_llvm/src/lib.rs Show resolved Hide resolved
compiler/rustc_data_structures/src/profiling.rs Show resolved Hide resolved
compiler/rustc_mir_build/src/build/matches/test.rs Outdated Show resolved Hide resolved
compiler/rustc_error_codes/src/error_codes/E0026.md Show resolved Hide resolved
tests/ui/error-codes/E0026-teach.stderr Outdated Show resolved Hide resolved
compiler/rustc_hir_analysis/src/astconv/mod.rs Outdated Show resolved Hide resolved
tests/ui/type-alias-enum-variants/enum-variant-generic-args.stderr Outdated Show resolved Hide resolved
@jsoref jsoref force-pushed the spelling-compiler branch from d845f82 to b7db808 Compare April 16, 2023 16:09
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jsoref
Copy link
Contributor Author

jsoref commented Apr 16, 2023

This is_const_evaluatable stuff appears to be a mess that also involves crossing rust-clippy (I have an open PR for stuff in rust-clippy that shouldn't do any cross stuff) (in my original work, I was pretty sure that CI was happy with me, but splitting is hazardous and I'm imperfect). I'm going to drop it and if/when this merges, I can approach it separately.

@jsoref jsoref force-pushed the spelling-compiler branch from b7db808 to 9094fbf Compare April 16, 2023 16:17
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jsoref jsoref force-pushed the spelling-compiler branch from 9094fbf to 991385e Compare April 16, 2023 16:29
@jsoref
Copy link
Contributor Author

jsoref commented Apr 16, 2023

I've hit that ordering thing a couple of times and I thought I fixed it a couple of times. It's taken me a while to understand why it's happening (because I see the beginning word and treat it as if it's the same for both of the first two tokens, but, of course by fixing the spelling of the beginning word) -- the second word now sorts properly instead of jumping the queue because it was sorting against the last letter of the previous word.

@jsoref jsoref force-pushed the spelling-compiler branch from 991385e to 19a3cb3 Compare April 16, 2023 22:05
Noratrieb
Noratrieb reviewed Apr 17, 2023
View reviewed changes
compiler/rustc_resolve/src/errors.rs
@@ -22,7 +22,7 @@ pub(crate) struct UnderscoreLifetimeNameCannotBeUsedHere(#[primary_span] pub(cra

#[derive(Diagnostic)]
#[diag(resolve_crate_may_not_be_imported)]
pub(crate) struct CrateMayNotBeImprted(#[primary_span] pub(crate) Span);
pub(crate) struct CrateMayNotBeImported(#[primary_span] pub(crate) Span);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This struct is dead code, no one mentions it. You shouldn't remove it here, but this is interesting anyways. Looks like something from the diagnostics derive is messing up the dead code lint (cc @davidtwco).

Noratrieb
Noratrieb approved these changes Apr 17, 2023
View reviewed changes
Copy link
Member

@Noratrieb Noratrieb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me after squashing

@jsoref jsoref force-pushed the spelling-compiler branch from 19a3cb3 to 336a285 Compare April 17, 2023 15:06
@bors
Copy link
Contributor

bors commented Apr 17, 2023

☔ The latest upstream changes (presumably #110458) made this pull request unmergeable. Please resolve the merge conflicts.

@jsoref
Spelling - compiler
e09d0d2 
* account
* achieved
* advising
* always
* ambiguous
* analysis
* annotations
* appropriate
* build
* candidates
* cascading
* category
* character
* clarification
* compound
* conceptually
* constituent
* consts
* convenience
* corresponds
* debruijn
* debug
* debugable
* debuggable
* deterministic
* discriminant
* display
* documentation
* doesn't
* ellipsis
* erroneous
* evaluability
* evaluate
* evaluation
* explicitly
* fallible
* fulfill
* getting
* has
* highlighting
* illustrative
* imported
* incompatible
* infringing
* initialized
* into
* intrinsic
* introduced
* javascript
* liveness
* metadata
* monomorphization
* nonexistent
* nontrivial
* obligation
* obligations
* offset
* opaque
* opportunities
* opt-in
* outlive
* overlapping
* paragraph
* parentheses
* poisson
* precisely
* predecessors
* predicates
* preexisting
* propagated
* really
* reentrant
* referent
* responsibility
* rustonomicon
* shortcircuit
* simplifiable
* simplifications
* specify
* stabilized
* structurally
* suggestibility
* translatable
* transmuting
* two
* unclosed
* uninhabited
* visibility
* volatile
* workaround

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
@jsoref jsoref force-pushed the spelling-compiler branch from 336a285 to e09d0d2 Compare April 17, 2023 20:10
@Noratrieb
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Apr 18, 2023

📌 Commit e09d0d2 has been approved by Nilstrieb

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 18, 2023
@GuillaumeGomez GuillaumeGomez mentioned this pull request Apr 18, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 18, 2023
@bors
Auto merge of rust-lang#110492 - GuillaumeGomez:rollup-n4tpbl4, r=Gui…
4e46301 
…llaumeGomez

Rollup of 5 pull requests

Successful merges:

 - rust-lang#110417 (Spelling compiler)
 - rust-lang#110441 (5 little typos)
 - rust-lang#110485 (Fix bootstrap locking)
 - rust-lang#110488 (Add a failing rustdoc-ui test for public infinite recursive type)
 - rust-lang#110490 (Bump `download-ci-llvm-stamp` for loong support)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit aa87add into rust-lang:master Apr 18, 2023
@rustbot rustbot added this to the 1.71.0 milestone Apr 18, 2023
@jsoref jsoref deleted the spelling-compiler branch April 18, 2023 21:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Noratrieb Noratrieb Noratrieb approved these changes

Assignees

@Noratrieb Noratrieb

Labels
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Milestone
1.71.0
Development

Successfully merging this pull request may close these issues.
5 participants
@jsoref @rustbot @Noratrieb @rust-log-analyzer @bors