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

remove repetitive words #113717

Merged
merged 1 commit into from
Jul 31, 2023
Merged

remove repetitive words #113717

merged 1 commit into from
Jul 31, 2023

Conversation

cuishuang
Copy link
Contributor

No description provided.

@rustbot
Copy link
Collaborator

rustbot commented Jul 15, 2023

r? @eholk

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added 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. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jul 15, 2023
@rustbot
Copy link
Collaborator

rustbot commented Jul 15, 2023

The Miri subtree was changed

cc @rust-lang/miri

Portable SIMD is developed in its own repository. If possible, consider making this change to rust-lang/portable-simd instead.

cc @calebzulawski, @programmerjake

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@oli-obk
Copy link
Contributor

oli-obk commented Jul 15, 2023

r? @Nilstrieb

Please include some description of what you did and why you did it in your main post.

@rustbot rustbot assigned Noratrieb and unassigned eholk Jul 15, 2023
@rustbot
Copy link
Collaborator

rustbot commented Jul 15, 2023

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

@the8472
Copy link
Member

the8472 commented Jul 15, 2023

Your git history seems to include some other branch. You'll have to rebase on a current master to get rid of those.

@the8472
Copy link
Member

the8472 commented Jul 15, 2023 •
edited
Loading

Those commits accidentally got into master due to a bot glitch and then were removed but they're still in your branch.
You'll have to use git rebase -i to drop them.

try

git fetch upstream
git rebase -i upstream/master

and then drop (d) anything in the history that isn't yours.

Alternatively hard-reset your branch onto the current upstream master and then cherry-pick just your commit from your remote and then force-push that (careful with that approach, doing it in the wrong order will erase your commit entirely).

@cuishuang
Copy link
Contributor Author

Thanks!

@the8472
Copy link
Member

the8472 commented Jul 15, 2023

Looks like they're still there. I'll clean up the history for you.

@cuishuang cuishuang closed this Jul 15, 2023
@cuishuang cuishuang force-pushed the master branch 2 times, most recently from 9586c9f to 4d6e426 Compare July 15, 2023 16:23
@the8472
Copy link
Member

the8472 commented Jul 15, 2023

or not...

@cuishuang
Copy link
Contributor Author

Sorry, I seem to have done something wrong with the remote branch, causing it to close..

@cuishuang
Copy link
Contributor Author

cuishuang commented Jul 15, 2023 •
edited
Loading

I will resubmit and reopen later. Please wait me a few minutes

@cuishuang
Copy link
Contributor Author

Done

@cuishuang cuishuang reopened this Jul 15, 2023
the8472
the8472 reviewed Jul 15, 2023
View reviewed changes
Copy link
Member

@the8472 the8472 left a comment

Choose a reason for hiding this comment

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

Most of the time "the the" or "is is" are typos.

But I think "that that" is more ambiguous. It can be a a mistake. But it can also be valid. On the other hand some uses of "that" are optional. So it's more a style question whether the optional ones should be removed, be kept to reduce churn or be rephrased to something less confusing.

I don't know what the policy here is.

@cuishuang
Copy link
Contributor Author

Most of the time "the the" or "is is" are typos.

But I think "that that" is more ambiguous. It can be a a mistake. But it can also be valid. On the other hand some uses of "that" are optional. So it's more a style question whether the optional ones should be removed, be kept to reduce churn or be rephrased to something less confusing.

I don't know what the policy here is.

Do I need to roll back the changes related to that?😄

@cuishuang
Copy link
Contributor Author

friendly ping~

@the8472 the8472 assigned the8472 and unassigned Noratrieb Jul 31, 2023
Noratrieb
Noratrieb requested changes Jul 31, 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.

Almost all the that that seem correct, so can you drop them? The one in libtest is pretty weird and I've suggested better wording.

compiler/rustc_resolve/src/late.rs Outdated Show resolved Hide resolved
library/test/src/types.rs Outdated Show resolved Hide resolved
tests/incremental/hashes/enum_constructors.rs Outdated Show resolved Hide resolved
tests/mir-opt/copy-prop/dead_stores_better.rs Outdated Show resolved Hide resolved
@the8472 the8472 assigned Noratrieb and unassigned the8472 Jul 31, 2023
@cuishuang
remove repetitive words
88c7b16 
Signed-off-by: cui fliter <[email protected]>
@cuishuang
Copy link
Contributor Author

Modified, please review again.

@Noratrieb
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jul 31, 2023

📌 Commit 88c7b16 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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 31, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 31, 2023
@matthiaskrgr
Rollup merge of rust-lang#113717 - cuishuang:master, r=Nilstrieb
88cfe31 
remove repetitive words
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 31, 2023
@matthiaskrgr
Rollup merge of rust-lang#113717 - cuishuang:master, r=Nilstrieb
957eeb7 
remove repetitive words
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 31, 2023
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 31, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 31, 2023
@bors
Auto merge of rust-lang#114307 - matthiaskrgr:rollup-8k5rq16, r=matth…
db7ff98 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#112858 (Update Android system definitions and add riscv-linux-android as tier 3 target)
 - rust-lang#113717 (remove repetitive words)
 - rust-lang#113725 (Move MinGW linker dist option to proper section)
 - rust-lang#113740 (Update `.gitmodules` to use shallow submodule clones)
 - rust-lang#113889 (Fix ice tests when librustc-driver is linked dynamically)
 - rust-lang#113906 (etc: add `RUSTC_BOOTSTRAP` to rust-analyzer config)
 - rust-lang#113920 (fix(resolve): report unresolved imports firstly)
 - rust-lang#114111 (Improve test case for experimental API remove_matches)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 58f963f into rust-lang:master Jul 31, 2023
@rustbot rustbot added this to the 1.73.0 milestone Jul 31, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@the8472 the8472 the8472 left review comments

@Noratrieb Noratrieb Noratrieb approved these changes

Assignees

@Noratrieb Noratrieb

Labels
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. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.73.0
Development

Successfully merging this pull request may close these issues.
8 participants
@cuishuang @rustbot @rust-log-analyzer @oli-obk @the8472 @Noratrieb @bors @eholk