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

chore: Fix typos in 'compiler' (batch 2) #129877

Merged
merged 1 commit into from
Sep 3, 2024
Merged

chore: Fix typos in 'compiler' (batch 2) #129877

merged 1 commit into from
Sep 3, 2024

Conversation

Sajjon
Copy link
Contributor

@Sajjon Sajjon commented Sep 2, 2024

Batch 2/3: Fixes typos in compiler

(See issue tracking all PRs with typos fixes)

@rustbot
Copy link
Collaborator

rustbot commented Sep 2, 2024

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @pnkfelix (or someone else) some time within the next two weeks.

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) PG-exploit-mitigations Project group: Exploit mitigations 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 Sep 2, 2024
@rustbot
Copy link
Collaborator

rustbot commented Sep 2, 2024

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred in exhaustiveness checking

cc @Nadrieril

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred in compiler/rustc_sanitizers

cc @rust-lang/project-exploit-mitigations, @rcvalle

Some changes occurred in check-cfg diagnostics

cc @Urgau

@Sajjon Sajjon mentioned this pull request Sep 2, 2024
Closed
3 tasks
Sajjon
Sajjon commented Sep 2, 2024
View reviewed changes
compiler/rustc_mir_transform/src/match_branches.rs
@@ -302,17 +302,17 @@ enum ExpectedTransformKind<'tcx, 'a> {
Cast { place: &'a Place<'tcx>, ty: Ty<'tcx> },
}

enum TransfromKind {
enum TransformKind {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Completely understand if this should be reverted, since it is not just a doc change but changing the code...

Sajjon
Sajjon commented Sep 2, 2024
View reviewed changes
compiler/rustc_mir_transform/src/match_branches.rs
@@ -289,7 +289,7 @@ fn can_cast(

#[derive(Default)]
struct SimplifyToExp {
transfrom_kinds: Vec<TransfromKind>,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

revert?

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Sajjon
Copy link
Contributor Author

Sajjon commented Sep 2, 2024

There is a typo in compiler/rustc_span/src/lib.rs where function prefer_remapped_unconditionaly is misspelled (should be prefer_remapped_unconditionally), but I did not include that change, since it would also require changes to:

  • src/librustdoc/doctest.rs
  • src/librustdoc/html/sources.rs
  • src/tools/miri/src/shims/backtrace.rs
    which all references that function.

fee1-dead
fee1-dead approved these changes Sep 2, 2024
View reviewed changes
compiler/rustc_resolve/src/errors.rs
@@ -894,7 +894,7 @@ pub(crate) struct LendingIteratorReportError {
}

#[derive(Diagnostic)]
#[diag(resolve_anonymous_livetime_non_gat_report_error)]
#[diag(resolve_anonymous_lifetime_non_gat_report_error)]
pub(crate) struct AnonymousLivetimeNonGatReportError {
Copy link
Member

Choose a reason for hiding this comment

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

This is also a typo: should be AnonymousLifetimeNonGatReportError. No need to do that in this PR though.

@fee1-dead
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Sep 2, 2024

📌 Commit 00de006 has been approved by fee1-dead

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-review Status: Awaiting review from the assignee but also interested parties. labels Sep 2, 2024
@fee1-dead fee1-dead assigned fee1-dead and unassigned pnkfelix Sep 2, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Sep 2, 2024
@matthiaskrgr
Rollup merge of rust-lang#129877 - Sajjon:sajjon_fix_typos_batch_2, r…
364135a 
…=fee1-dead

chore: Fix typos in 'compiler' (batch 2)

Batch 2/3: Fixes typos in `compiler`

(See [issue](rust-lang#129874) tracking all PRs with typos fixes)
@matthiaskrgr matthiaskrgr mentioned this pull request Sep 2, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 2, 2024
@bors
Auto merge of rust-lang#129898 - matthiaskrgr:rollup-eexd2g8, r=matth…
67e8365 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#129152 (custom/external clippy support for bootstrapping)
 - rust-lang#129529 (Add test to build crates used by r-a on stable)
 - rust-lang#129829 (Make decoding non-optional `LazyArray` panic if not set)
 - rust-lang#129860 (update `object` dependency to remove duplicate `wasmparser`)
 - rust-lang#129875 (chore: Fix typos in 'compiler' (batch 1))
 - rust-lang#129877 (chore: Fix typos in 'compiler' (batch 2))
 - rust-lang#129878 (chore: Fix typos in 'compiler' (batch 3))
 - rust-lang#129891 (Do not request sanitizers for naked functions)
 - rust-lang#129892 (Clarify language around ptrs in slice::raw)

Failed merges:

 - rust-lang#129777 (Add `unreachable_pub`, round 4)
 - rust-lang#129868 (Remove kobzol vacation status)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Sep 2, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 2, 2024
@bors
Auto merge of rust-lang#129915 - matthiaskrgr:rollup-56h2xp2, r=matth…
2251572 
…iaskrgr

Rollup of 12 pull requests

Successful merges:

 - rust-lang#129748 (Box validity: update for new zero-sized rules)
 - rust-lang#129829 (Make decoding non-optional `LazyArray` panic if not set)
 - rust-lang#129856 (compiler_fence documentation: emphasize synchronization, not reordering)
 - rust-lang#129868 (Remove kobzol vacation status)
 - rust-lang#129875 (chore: Fix typos in 'compiler' (batch 1))
 - rust-lang#129877 (chore: Fix typos in 'compiler' (batch 2))
 - rust-lang#129878 (chore: Fix typos in 'compiler' (batch 3))
 - rust-lang#129890 (Remove stray word in a comment)
 - rust-lang#129892 (Clarify language around ptrs in slice::raw)
 - rust-lang#129905 (mailmap: add new email for davidtwco)
 - rust-lang#129906 (mailmapper?)
 - rust-lang#129907 (Fix compile error in solid's remove_dir_all)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 1d9eb9d into rust-lang:master Sep 3, 2024
6 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Sep 3, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Sep 3, 2024
@rust-timer
Unrolled build for rust-lang#129877
91fddeb 
Rollup merge of rust-lang#129877 - Sajjon:sajjon_fix_typos_batch_2, r=fee1-dead

chore: Fix typos in 'compiler' (batch 2)

Batch 2/3: Fixes typos in `compiler`

(See [issue](rust-lang#129874) tracking all PRs with typos fixes)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fee1-dead fee1-dead fee1-dead approved these changes

Assignees

@fee1-dead fee1-dead

Labels
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) PG-exploit-mitigations Project group: Exploit mitigations 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.83.0
Development

Successfully merging this pull request may close these issues.
6 participants
@Sajjon @rustbot @rust-log-analyzer @fee1-dead @bors @pnkfelix