Skip to content

Refer to "associated functions" instead of "static methods" - #65542

Merged
bors merged 5 commits into
rust-lang:masterfrom
estebank:kill-static-methods
Oct 19, 2019
Merged

Refer to "associated functions" instead of "static methods"#65542
bors merged 5 commits into
rust-lang:masterfrom
estebank:kill-static-methods

Conversation

@estebank

@estebankestebank commented Oct 18, 2019

Copy link
Copy Markdown
Contributor

Fix#59782.

@rust-highfive

rust-highfive commented Oct 18, 2019

Copy link
Copy Markdown
Contributor

Some changes occurred in diagnostic error codes

cc @GuillaumeGomez

@rust-highfive

rust-highfive commented Oct 18, 2019

Copy link
Copy Markdown
Contributor

r? @matthewjasper

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 18, 2019
@estebank

estebank commented Oct 18, 2019

Copy link
Copy Markdown
ContributorAuthor

cc @Centril@petrochenkov

Centril
Centril reviewed Oct 18, 2019
View reviewed changes
Comment threadsrc/librustc_resolve/error_codes.rs Outdated
Comment threadsrc/librustc_resolve/error_codes.rs Outdated
Comment threadsrc/librustc_resolve/error_codes.rs Outdated
Comment threadsrc/librustc_resolve/error_codes.rs Outdated
Comment threadsrc/librustc_resolve/error_codes.rs Outdated
Comment threadsrc/librustc_resolve/error_codes.rs Outdated
Comment threadsrc/librustc_resolve/error_codes.rs Outdated
Comment threadsrc/libsyntax_ext/deriving/generic/mod.rs Outdated
@estebank

estebank commented Oct 18, 2019

Copy link
Copy Markdown
ContributorAuthor

@Centril can you take a look at the new wording?

GuillaumeGomez
GuillaumeGomez reviewed Oct 18, 2019
View reviewed changes
Comment threadsrc/librustc_resolve/error_codes.rs Outdated
@Centril

Centril commented Oct 19, 2019

Copy link
Copy Markdown
Contributor

r? @Centril@bors r+

@bors

bors commented Oct 19, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 2b76c8b 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 Oct 19, 2019
Centril added a commit to Centril/rust that referenced this pull request Oct 19, 2019
@Centril
Rollup merge ofrust-lang#65542- estebank:kill-static-methods, r=Cen…
e74345a
…tril
Refer to "associated functions" instead of "static methods"
Fixrust-lang#59782.
@CentrilCentril mentioned this pull request Oct 19, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Oct 19, 2019
@Centril
Rollup merge ofrust-lang#65542- estebank:kill-static-methods, r=Cen…
45a5dab
…tril
Refer to "associated functions" instead of "static methods"
Fixrust-lang#59782.
@CentrilCentril mentioned this pull request Oct 19, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Oct 19, 2019
@Centril
Rollup merge ofrust-lang#65542- estebank:kill-static-methods, r=Cen…
fab7404
…tril
Refer to "associated functions" instead of "static methods"
Fixrust-lang#59782.
@CentrilCentril mentioned this pull request Oct 19, 2019
Merged
bors added a commit that referenced this pull request Oct 19, 2019
@bors
Auto merge of#65588- Centril:rollup-9k55k3t, r=Centril
9578272
Rollup of 6 pull requests
Successful merges:
- #65174 (Fix zero-size uninitialized boxes)
- #65252 (expand: Simplify expansion of derives)
- #65485 (Suppress ICE when validators disagree on `LiveDrop`s in presence of `&mut`)
- #65542 (Refer to "associated functions" instead of "static methods")
- #65545 (More symbol cleanups)
- #65576 (Don't add `argc` and `argv` arguments to `main` on WASI.)
Failed merges:
r? @ghost
@bors
bors merged commit 2b76c8b into rust-lang:masterOct 19, 2019
@estebank
estebank deleted the kill-static-methods branch November 9, 2023 05:18
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@GuillaumeGomezGuillaumeGomezGuillaumeGomez left review comments
+1 more reviewer
@CentrilCentrilCentril 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.

E0424 The self keyword was used in a static method.

6 participants

@estebank@rust-highfive@Centril@bors@GuillaumeGomez@matthewjasper