Skip to content

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

Merged
bors merged 2 commits into
rust-lang:masterfrom
mark-i-m:assoc-fn
Mar 12, 2020
Merged

Rename DefKind::Method and TraitItemKind::Method #69674
bors merged 2 commits into
rust-lang:masterfrom
mark-i-m:assoc-fn

Conversation

@mark-i-m

Copy link
Copy Markdown
Contributor

@Centril

Copy link
Copy Markdown
Contributor

r? @Centril@bors r+

@bors

bors commented Mar 3, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 3aeb9f0 has been approved by Centril

@rust-highfiverust-highfive assigned Centril and unassigned eddybMar 3, 2020
@borsbors 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
@JohnTitorJohnTitor mentioned this pull request Mar 5, 2020
Comment threadsrc/librustc/hir/map/mod.rs
Comment threadsrc/librustc_lint/builtin.rs
Comment threadsrc/librustc_metadata/rmeta/decoder.rs
Comment threadsrc/librustc_metadata/rmeta/encoder.rs
bors added a commit that referenced this pull request Mar 5, 2020
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.

Centril added a commit to Centril/rust that referenced this pull request Mar 6, 2020
@CentrilCentril mentioned this pull request Mar 6, 2020
bors added a commit that referenced this pull request Mar 6, 2020
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
@CentrilCentril mentioned this pull request Mar 6, 2020
Centril added a commit to Centril/rust that referenced this pull request Mar 7, 2020
@CentrilCentril mentioned this pull request Mar 7, 2020
@Centril

Copy link
Copy Markdown
Contributor

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

@borsbors 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
@CentrilCentril 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
Copy Markdown
Contributor

toolstate week is over @bors r+

@bors

bors commented Mar 12, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 3aeb9f0 has been approved by matthewjasper

@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-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Mar 12, 2020
@CentrilCentril mentioned this pull request Mar 12, 2020
bors added a commit that referenced this pull request Mar 12, 2020
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:masterMar 12, 2020
JohnTitor added a commit to JohnTitor/rust-clippy that referenced this pull request Mar 12, 2020
bors added a commit to rust-lang/rust-clippy that referenced this pull request Mar 12, 2020
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 12, 2020
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
````
Fixesrust-lang#69957
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Mar 14, 2020
@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
Centril added a commit to Centril/rust that referenced this pull request Mar 23, 2020
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
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
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
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
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@mark-i-m@Centril@bors@matthewjasper@eddyb