Skip to content

Fix repeated word typos - #57314

Merged
bors merged 3 commits into
rust-lang:masterfrom
wikku:master
Jan 5, 2019
Merged

Fix repeated word typos#57314
bors merged 3 commits into
rust-lang:masterfrom
wikku:master

Conversation

@wikku

@wikkuwikku commented Jan 3, 2019

Copy link
Copy Markdown
Contributor

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-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 3, 2019
@Centril

Centril commented Jan 4, 2019

Copy link
Copy Markdown
Contributor

r? @Centril

@bors r+ rollup

@rust-highfiverust-highfive assigned Centril and unassigned frewsxcvJan 4, 2019
awaitlink
awaitlink reviewed Jan 4, 2019
View reviewed changes
Comment threadsrc/librustc/ty/fold.rs Outdated
@awaitlink

awaitlink commented Jan 4, 2019

Copy link
Copy Markdown
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

wikku commented Jan 4, 2019•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

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

awaitlink commented Jan 4, 2019

Copy link
Copy Markdown
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

Centril commented Jan 4, 2019

Copy link
Copy Markdown
Contributor

@bors r-

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

awaitlinkand 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

Centril commented Jan 4, 2019

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@CentrilCentril closed this Jan 4, 2019
@CentrilCentril reopened this Jan 4, 2019
@Centril

Centril commented Jan 4, 2019

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Jan 4, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 06243b1 has been approved by Centril

@borsbors 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 ofrust-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.
@kennytmkennytm 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:masterJan 5, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@awaitlinkawaitlinkawaitlink left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@CentrilCentril

Labels

S-waiting-on-borsStatus: 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