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

Fix repeated word typos #57314

Merged
merged 3 commits into from
Jan 5, 2019
Merged

Fix repeated word typos #57314

merged 3 commits into from
Jan 5, 2019

Conversation

wikku
Copy link
Contributor

@wikku wikku commented Jan 3, 2019

Inspired by #57295 (I skipped 'be be' because of it) and my PR in another repo

Not a stupid sed, I actually tried to fix case by case.

@wikku
Fix repeated word typos
190d139 
Found with `git grep -P '\b([a-z]+)\s+\1\b'`
@rust-highfive

This comment has been minimized.

Sign in to view
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 3, 2019
@Centril
Copy link
Contributor

Centril commented Jan 4, 2019

r? @Centril

@bors r+ rollup

@rust-highfive rust-highfive assigned Centril and unassigned frewsxcv Jan 4, 2019
awaitlink
awaitlink reviewed Jan 4, 2019
View reviewed changes
src/librustc/ty/fold.rs Outdated Show resolved Hide resolved
@awaitlink
Copy link
Contributor

What about these?

rust/src/librustc_typeck/astconv.rs

Line 2 in ae38bae

//! The main routine here is `ast_ty_to_ty()`; each use is is parameterized by

rust/src/librustc_mir/build/matches/test.rs

Line 453 in a602f13

/// the test for what value `x` has has no particular relevance

@wikku
Copy link
Contributor Author

wikku commented Jan 4, 2019 •
edited
Loading

What about these?

rust/src/librustc_typeck/astconv.rs

Line 2 in ae38bae
//! The main routine here is ast_ty_to_ty(); each use is is parameterized by

rust/src/librustc_mir/build/matches/test.rs

Line 453 in a602f13
/// the test for what value x has has no particular relevance

Seems like I missed the first one and the second one should be reworded (or is missing a comma?)

@awaitlink
Copy link
Contributor

Oh ok, has has is here just like that that in some other places. Hard to parse what it means at first.

I don't think it needs a comma though.

@Centril
Copy link
Contributor

Centril commented Jan 4, 2019

@bors r-

@wiktorkuchta If you want, add follow up commits to fix more typos. You can also file follow up PRs... :)

awaitlink and others added 2 commits January 4, 2019 17:49
@awaitlink @wikku
Update src/librustc/ty/fold.rs
632d584 
Co-Authored-By: wiktorkuchta <35867657+wiktorkuchta@users.noreply.github.com>
@wikku
Fix repeated word in astconv.rs
06243b1
@Centril
Copy link
Contributor

Centril commented Jan 4, 2019

@bors r+ rollup

@Centril Centril closed this Jan 4, 2019
@Centril Centril reopened this Jan 4, 2019
@Centril
Copy link
Contributor

Centril commented Jan 4, 2019

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 4, 2019

📌 Commit 06243b1 has been approved by Centril

@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 Jan 4, 2019
kennytm added a commit to kennytm/rust that referenced this pull request Jan 5, 2019
@kennytm
Rollup merge of rust-lang#57314 - wiktorkuchta:master, r=Centril
ab55ecf 
Fix repeated word typos

Inspired by rust-lang#57295 (I skipped 'be be' because of it) and my [PR in another repo
](cp-algorithms/cp-algorithms#389)
Not a stupid `sed`, I actually tried to fix case by case.
@kennytm kennytm mentioned this pull request Jan 5, 2019
Merged
bors added a commit that referenced this pull request Jan 5, 2019
@bors
Auto merge of #57354 - kennytm:rollup, r=kennytm
68fe518 
Rollup of 17 pull requests

Successful merges:

 - #57219 (Remove some unused code)
 - #57229 (Fix #56806 by using `delay_span_bug` in object safety layout sanity checks)
 - #57233 (Rename and fix nolink-with-link-args test)
 - #57238 (Fix backtraces for inlined functions on Windows)
 - #57249 (Fix broken links to second edition TRPL.)
 - #57267 (src/jemalloc is gone, remove its mention from COPYRIGHT)
 - #57273 (Update the stdsimd submodule)
 - #57278 (Add Clippy to config.toml.example)
 - #57295 (Fix 'be be' constructs)
 - #57311 (VaList::copy should not require a mutable ref)
 - #57312 (`const fn` is no longer coming soon (const keyword docs))
 - #57313 (Improve Box<T> -> Pin<Box<T>> conversion)
 - #57314 (Fix repeated word typos)
 - #57326 (Doc rewording, use the same name `writer`)
 - #57338 (rustdoc: force binary filename for compiled doctests)
 - #57342 (librustc_mir: Make qualify_min_const_fn module public)
 - #57343 (Calculate privacy access only via query)

Failed merges:

 - #57340 (Use correct tracking issue for c_variadic)

r? @ghost
@bors bors merged commit 06243b1 into rust-lang:master Jan 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@awaitlink awaitlink awaitlink left review comments

Assignees

@Centril Centril

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@wikku @rust-highfive @Centril @awaitlink @bors @frewsxcv