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.

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

Refer to "self type" instead of "receiver type" #64110

Merged
merged 7 commits into from
Sep 5, 2019

Conversation

estebank
Copy link
Contributor

@estebank estebank commented Sep 3, 2019

Fix #42603.

@rust-highfive
Copy link
Collaborator

Some changes occurred in diagnostic error codes

cc @GuillaumeGomez

@rust-highfive
Copy link
Collaborator

r? @zackmdavis

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 3, 2019
src/librustc_typeck/error_codes.rs Outdated Show resolved Hide resolved
src/librustc_typeck/error_codes.rs Outdated Show resolved Hide resolved
src/librustc_typeck/error_codes.rs Outdated Show resolved Hide resolved
src/librustc_typeck/error_codes.rs Outdated Show resolved Hide resolved
src/librustc_typeck/error_codes.rs Outdated Show resolved Hide resolved
src/librustc_typeck/error_codes.rs Outdated Show resolved Hide resolved
src/librustc_typeck/error_codes.rs Show resolved Hide resolved
src/librustc_typeck/error_codes.rs Outdated Show resolved Hide resolved
src/librustc/traits/object_safety.rs Outdated Show resolved Hide resolved
src/librustc/traits/object_safety.rs Show resolved Hide resolved
@Centril
Copy link
Contributor

Centril commented Sep 3, 2019

r? @Centril

@rust-highfive rust-highfive assigned Centril and unassigned zackmdavis Sep 3, 2019
@Centril Centril 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 Sep 3, 2019
src/librustc_typeck/error_codes.rs Outdated Show resolved Hide resolved
src/librustc_typeck/error_codes.rs Outdated Show resolved Hide resolved
src/librustc_typeck/error_codes.rs Outdated Show resolved Hide resolved
@estebank
Copy link
Contributor Author

estebank commented Sep 3, 2019

@Centril I'm torn on whether to call it "self-parameter type" or the current "self parameter type".

@Centril
Copy link
Contributor

Centril commented Sep 3, 2019

@Centril I'm torn on whether to call it "self-parameter type" or the current "self parameter type".

I think @alexreg is best placed to evaluate this. =P

@Centril
Copy link
Contributor

Centril commented Sep 3, 2019

I think @alexreg is best placed to evaluate this. =P

But I read https://www.grammarbook.com/punctuation/hyphens.asp and https://www.grammarly.com/blog/hyphen/ which suggest that "self-parameter type" is correct.

@rust-highfive

This comment has been minimized.

@Centril
Copy link
Contributor

Centril commented Sep 4, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Sep 4, 2019

📌 Commit e16ce80 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 4, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 5, 2019
Refer to "`self` type" instead of "receiver type"

Fix rust-lang#42603.
Centril added a commit to Centril/rust that referenced this pull request Sep 5, 2019
Refer to "`self` type" instead of "receiver type"

Fix rust-lang#42603.
bors added a commit that referenced this pull request Sep 5, 2019
Rollup of 15 pull requests

Successful merges:

 - #62860 (Stabilize checked_duration_since for 1.38.0)
 - #63549 (Rev::rposition counts from the wrong end)
 - #63985 (Stabilize pin_into_inner in 1.39.0)
 - #64005 (Add a `Place::is_indirect` method to determine whether a `Place` contains a `Deref` projection)
 - #64031 (Harden `param_attrs` test wrt. usage of a proc macro `#[attr]`)
 - #64038 (Check impl trait substs when checking for recursive types)
 - #64043 (Add some more tests for underscore imports)
 - #64092 (Update xLTO compatibility table in rustc book.)
 - #64110 (Refer to "`self` type" instead of "receiver type")
 - #64120 (Move path parsing earlier)
 - #64123 (Added warning around code with reference to uninit bytes)
 - #64128 (unused_parens: account for or-patterns and `&(mut x)`)
 - #64141 (Minimize uses of `LocalInternedString`)
 - #64142 (Fix doc links in `std::cmp` module)
 - #64148 (fix a few typos in comments)

Failed merges:

r? @ghost
@bors bors merged commit e16ce80 into rust-lang:master Sep 5, 2019
@estebank estebank deleted the receiver-type branch November 9, 2023 05:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
5 participants