Skip to content

Rename DefKind::Method and TraitItemKind::Method #69674

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 2 commits into from
Mar 12, 2020
Merged

Rename DefKind::Method and TraitItemKind::Method #69674

merged 2 commits into from
Mar 12, 2020

Conversation

mark-i-m
Copy link
Member

@mark-i-m mark-i-m commented Mar 3, 2020

@mark-i-m mark-i-m mentioned this pull request Mar 3, 2020
Merged
@Centril
Copy link
Contributor

Centril commented Mar 3, 2020

r? @Centril @bors r+

@bors
Copy link
Collaborator

bors commented Mar 3, 2020

📌 Commit 3aeb9f0 has been approved by Centril

@rust-highfive rust-highfive assigned Centril and unassigned eddyb Mar 3, 2020
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 3, 2020
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Mar 5, 2020
@JohnTitor
Rollup merge of rust-lang#69674 - mark-i-m:assoc-fn, r=Centril
210d693 
Rename DefKind::Method and TraitItemKind::Method

r? @eddyb, @Centril, or @matthewjasper

cc rust-lang#69498 rust-lang#60163
@JohnTitor JohnTitor mentioned this pull request Mar 5, 2020
Closed
bors added a commit that referenced this pull request Mar 5, 2020
@bors
Auto merge of #69724 - JohnTitor:rollup-vv7w65h, r=JohnTitor
f6c22f0 
Rollup of 10 pull requests

Successful merges:

 - #69520 (Make error message clearer about creating new module)
 - #69589 (ast: `Mac`/`Macro` -> `MacCall`)
 - #69614 (`delay_span_bug` when codegen cannot select obligation)
 - #69641 (Update books)
 - #69674 (Rename DefKind::Method and TraitItemKind::Method )
 - #69697 (Add explanation for E0380)
 - #69698 (Use associated constants of integer types)
 - #69705 (Toolstate: remove redundant beta-week check.)
 - #69711 (Update macros.rs: fix documentation typo.)
 - #69713 (more clippy cleanups)

Failed merges:

r? @ghost
@mark-i-m

This comment has been minimized.

# to view
This was referenced Mar 5, 2020
Merged
Merged
Centril added a commit to Centril/rust that referenced this pull request Mar 6, 2020
@Centril
Rollup merge of rust-lang#69674 - mark-i-m:assoc-fn, r=Centril
19272a0 
Rename DefKind::Method and TraitItemKind::Method

r? @eddyb, @Centril, or @matthewjasper

cc rust-lang#69498 rust-lang#60163
@Centril Centril mentioned this pull request Mar 6, 2020
Closed
bors added a commit that referenced this pull request Mar 6, 2020
@bors
Auto merge of #69759 - Centril:rollup-0m0yh1l, r=Centril
e9149ca 
Rollup of 6 pull requests

Successful merges:

 - #69656 (Use .next() instead of .nth(0) on iterators.)
 - #69674 (Rename DefKind::Method and TraitItemKind::Method )
 - #69676 (Pass correct place to `discriminant_switch_effect`)
 - #69706 (Use subslice patterns in slice methods)
 - #69714 (Make PlaceRef take just one lifetime)
 - #69727 (Avoid using `unwrap()` in suggestions)

Failed merges:

 - #69589 (ast: `Mac`/`Macro` -> `MacCall`)
 - #69680 (rustc_expand: Factor out `Annotatable::into_tokens` to a separate method)

r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Mar 6, 2020
@Centril
Rollup merge of rust-lang#69674 - mark-i-m:assoc-fn, r=Centril
ed6ecf6 
Rename DefKind::Method and TraitItemKind::Method

r? @eddyb, @Centril, or @matthewjasper

cc rust-lang#69498 rust-lang#60163
@Centril Centril mentioned this pull request Mar 6, 2020
Closed
Centril added a commit to Centril/rust that referenced this pull request Mar 7, 2020
@Centril
Rollup merge of rust-lang#69674 - mark-i-m:assoc-fn, r=Centril
e3def0e 
Rename DefKind::Method and TraitItemKind::Method

r? @eddyb, @Centril, or @matthewjasper

cc rust-lang#69498 rust-lang#60163
@Centril Centril mentioned this pull request Mar 7, 2020
Closed
@Centril
Copy link
Contributor

Centril commented Mar 7, 2020

Failed in #69795 (comment) due to toolstate week, @bors r-

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 7, 2020
@Centril Centril added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 7, 2020
@matthewjasper
Copy link
Contributor

toolstate week is over @bors r+

@bors
Copy link
Collaborator

bors commented Mar 12, 2020

📌 Commit 3aeb9f0 has been approved by matthewjasper

@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-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Mar 12, 2020
@Centril Centril mentioned this pull request Mar 12, 2020
Merged
bors added a commit that referenced this pull request Mar 12, 2020
@bors
Auto merge of #69950 - Centril:rollup-xh0hmvx, r=Centril
54b7d21 
Rollup of 10 pull requests

Successful merges:

 - #68899 (Add Display and Error impls for proc_macro::LexError)
 - #69011 (Document unsafe blocks in core::fmt)
 - #69674 (Rename DefKind::Method and TraitItemKind::Method )
 - #69705 (Toolstate: remove redundant beta-week check.)
 - #69722 (Tweak output for invalid negative impl AST errors)
 - #69747 (Rename rustc guide)
 - #69792 (Implement Error for TryReserveError)
 - #69830 (miri: ICE on invalid terminators)
 - #69921 (rustdoc: remove unused import)
 - #69945 (update outdated comment)

Failed merges:

r? @ghost
@bors bors merged commit 9bc7386 into rust-lang:master Mar 12, 2020
JohnTitor added a commit to JohnTitor/rust-clippy that referenced this pull request Mar 12, 2020
@JohnTitor
Rustup to rust-lang/rust#69674
3e37766
bors added a commit to rust-lang/rust-clippy that referenced this pull request Mar 12, 2020
@bors
Auto merge of #5307 - JohnTitor:rename-method, r=flip1995
b064ea8 
Rustup to rust-lang/rust#69674

changelog: none
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 12, 2020
@matthiaskrgr
submodules: update clippy from 329923e to 8485d40
66949a7 
Changes:
````
Rustup to rust-lang#69674
Use visit_place
Check for mutation
Only fires on temporaries
Extend `redundant_clone` to the case that cloned value is not consumed
add CR feedback
Improve documentation
Use `edition:2018` flag more widely
Update tests/ui/needless_doc_main.rs
Move links to the end of each chapter on adding_lints
Move links to the end of each chapter on CONTRIBUTING
Clean-up adding_lints.md
Clean-up CONTRIBUTING.md
needless_doc_main: only check rust code
Use `node_type_opt` over `node_type`
Fix doc
Fix ICE with trivial_bounds feature
clippy_lints: readme: don't mention crates.io since it is no longer used to publish clippy.
update rust-lang.github.io to rustc-dev-guide.rust-lang.org
Improve placeholder in map_unit_fn
Fix match single binding when in a let stmt
Improve error messages for {option,result}_map_unit_fn
Mention the setup instructions in CONTRIBUTING
redundant_pattern: take binding (ref, ref mut) into account in suggestion.
check_pat: delay creation of the "normal" vec until we reach the branch where is is actually needed
deps: bump itertools 0.8 -> 0.9
add lint on File::read_to_string and File::read_to_end
transition rustc-guide to rustc-dev-guide
Rename macro_use_import -> macro_use_imports
warn on macro_use attr
Fix deploy script for tag deploys
````

Fixes rust-lang#69957
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Mar 14, 2020
@JohnTitor
Rollup merge of rust-lang#69738 - mark-i-m:assoc-fn-2, r=Centril
7cae549 
More Method -> AssocFn renaming

r? @Centril @eddyb

cc rust-lang#60163

Blocked on rust-lang#69674
@mark-i-m mark-i-m deleted the assoc-fn branch March 15, 2020 16:16
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Mar 16, 2020
@Dylan-DPC
Rollup merge of rust-lang#69738 - mark-i-m:assoc-fn-2, r=eddyb
0d7c82e 
More Method -> AssocFn renaming

r? @Centril @eddyb

cc rust-lang#60163

Blocked on rust-lang#69674
Centril added a commit to Centril/rust that referenced this pull request Mar 23, 2020
@Centril
Rollup merge of rust-lang#69740 - mark-i-m:describe-it-3, r=eddyb
093602e 
Replace some desc logic in librustc_lint with article_and_desc

r? @eddyb @Centril @matthewjasper

Followup to rust-lang#69674

Blocked on rust-lang#69498
Centril added a commit to Centril/rust that referenced this pull request Mar 23, 2020
@Centril
Rollup merge of rust-lang#69740 - mark-i-m:describe-it-3, r=eddyb
1a5ad59 
Replace some desc logic in librustc_lint with article_and_desc

r? @eddyb @Centril @matthewjasper

Followup to rust-lang#69674

Blocked on rust-lang#69498
Centril added a commit to Centril/rust that referenced this pull request Mar 23, 2020
@Centril
Rollup merge of rust-lang#69740 - mark-i-m:describe-it-3, r=eddyb
ee90948 
Replace some desc logic in librustc_lint with article_and_desc

r? @eddyb @Centril @matthewjasper

Followup to rust-lang#69674

Blocked on rust-lang#69498
flip1995 pushed a commit to flip1995/rust-clippy that referenced this pull request May 5, 2020
@matthiaskrgr
submodules: update clippy from 329923e to 8485d40
b7fc905 
Changes:
````
Rustup to rust-lang/rust#69674
Use visit_place
Check for mutation
Only fires on temporaries
Extend `redundant_clone` to the case that cloned value is not consumed
add CR feedback
Improve documentation
Use `edition:2018` flag more widely
Update tests/ui/needless_doc_main.rs
Move links to the end of each chapter on adding_lints
Move links to the end of each chapter on CONTRIBUTING
Clean-up adding_lints.md
Clean-up CONTRIBUTING.md
needless_doc_main: only check rust code
Use `node_type_opt` over `node_type`
Fix doc
Fix ICE with trivial_bounds feature
clippy_lints: readme: don't mention crates.io since it is no longer used to publish clippy.
update rust-lang.github.io to rustc-dev-guide.rust-lang.org
Improve placeholder in map_unit_fn
Fix match single binding when in a let stmt
Improve error messages for {option,result}_map_unit_fn
Mention the setup instructions in CONTRIBUTING
redundant_pattern: take binding (ref, ref mut) into account in suggestion.
check_pat: delay creation of the "normal" vec until we reach the branch where is is actually needed
deps: bump itertools 0.8 -> 0.9
add lint on File::read_to_string and File::read_to_end
transition rustc-guide to rustc-dev-guide
Rename macro_use_import -> macro_use_imports
warn on macro_use attr
Fix deploy script for tag deploys
````

Fixes #69957
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@eddyb eddyb eddyb 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.
5 participants
@mark-i-m @Centril @bors @matthewjasper @eddyb