Skip to content

More Method -> AssocFn renaming#69738

Merged
bors merged 3 commits intorust-lang:masterfrom
mark-i-m:assoc-fn-2
Mar 16, 2020
Merged

More Method -> AssocFn renaming#69738
bors merged 3 commits intorust-lang:masterfrom
mark-i-m:assoc-fn-2

Conversation

@mark-i-m
Copy link
Contributor

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

r? @Centril @eddyb

cc #60163

Blocked on #69674

eddyb
eddyb reviewed Mar 5, 2020
View reviewed changes
@Centril Centril added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 5, 2020
@mark-i-m
Copy link
Contributor Author

mark-i-m commented Mar 7, 2020

@rustbot modify labels: +S-blocked -S-waiting-on-author

@Centril Done! But we should still wait for the other PR, since this is rebased on that one.

@rustbot rustbot 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
@mark-i-m
Copy link
Contributor Author

mark-i-m commented Mar 12, 2020

@rustbot modify labels: +S-waiting-on-review -S-blocked

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Mar 12, 2020
@Centril
Copy link
Contributor

Centril commented Mar 12, 2020

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 12, 2020

📌 Commit b9aef25 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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 12, 2020
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
@JohnTitor JohnTitor mentioned this pull request Mar 14, 2020
Closed
@bors
Copy link
Collaborator

bors commented Mar 14, 2020

☔ The latest upstream changes (presumably #69076) made this pull request unmergeable. Please resolve the merge conflicts.

@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 14, 2020
@mark-i-m
Copy link
Contributor Author

mark-i-m commented Mar 14, 2020

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 14, 2020
eddyb
eddyb reviewed Mar 15, 2020
View reviewed changes
@eddyb
Copy link
Member

eddyb commented Mar 15, 2020

r=me after fixing #69738 (comment)

@eddyb
Copy link
Member

eddyb commented Mar 15, 2020

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 15, 2020

📌 Commit 79735d157a083a9c032b76a798f806ea78645c37 has been approved by eddyb

@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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 15, 2020
@bors
Copy link
Collaborator

bors commented Mar 15, 2020

☔ The latest upstream changes (presumably #68944) made this pull request unmergeable. Please resolve the merge conflicts.

@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 15, 2020
@rust-highfive
Copy link
Contributor

rust-highfive commented Mar 16, 2020

The job x86_64-gnu-llvm-7 of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log. 
2020-03-16T00:18:00.1639722Z ========================== Starting Command Output ===========================
2020-03-16T00:18:00.1643653Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/38ac25cc-51ad-44b6-9e91-6d8b376407a2.sh
2020-03-16T00:18:00.1644062Z 
2020-03-16T00:18:00.1648503Z ##[section]Finishing: Disable git automatic line ending conversion
2020-03-16T00:18:00.1668187Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/69738/merge to s
2020-03-16T00:18:00.1671587Z Task         : Get sources
2020-03-16T00:18:00.1671908Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-03-16T00:18:00.1672228Z Version      : 1.0.0
2020-03-16T00:18:00.1672439Z Author       : Microsoft
---
2020-03-16T00:18:01.1518720Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-03-16T00:18:01.1523799Z ##[command]git config gc.auto 0
2020-03-16T00:18:01.1527145Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-03-16T00:18:01.1530204Z ##[command]git config --get-all http.proxy
2020-03-16T00:18:01.1536966Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/69738/merge:refs/remotes/pull/69738/merge

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

@eddyb
Copy link
Member

eddyb commented Mar 16, 2020

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 16, 2020

📌 Commit 1b92e86 has been approved by eddyb

@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 Mar 16, 2020
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Mar 16, 2020
Merged
bors added a commit that referenced this pull request Mar 16, 2020
@bors
Auto merge of #70040 - Dylan-DPC:rollup-id1k6lz, r=Dylan-DPC
59f4ba9 
Rollup of 7 pull requests

Successful merges:

 - #67335 (Refactor the `Qualif` trait)
 - #69122 (Backtrace Debug tweaks)
 - #69520 (Make error message clearer about creating new module)
 - #69738 (More Method -> AssocFn renaming)
 - #69867 (Add long error explanation for E0628 )
 - #69989 (resolve/hygiene: `macro_rules` are not "legacy")
 - #70036 (Make article_and_description primarily use def_kind)

Failed merges:

r? @ghost
matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request Mar 16, 2020
@matthiaskrgr
rustup rust-lang/rust#69738
9a68452
@bors bors merged commit 0d7c82e into rust-lang:master Mar 16, 2020
matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request Mar 16, 2020
@matthiaskrgr
rustup rust-lang/rust#69738
a97f60b
bors added a commit to rust-lang/rust-clippy that referenced this pull request Mar 16, 2020
@bors
Auto merge of #5324 - matthiaskrgr:rustup_32, r=flip1995
23549a8 
rustup rust-lang/rust#69738

changelog: none
@mark-i-m mark-i-m deleted the assoc-fn-2 branch March 16, 2020 17:47
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 16, 2020
@matthiaskrgr
submodules: update clippy from 8485d40 to 23549a8
7e2ebb0 
Changes:
````
rustup rust-lang#69738
rustup rust-lang#68944
Make use of `or_patterns` feature
rustup rust-lang#69589
Rustup to rust-lang#69076
Don't convert Path to lossy str
Use `into_path`
Use pattern matching instead of manually checking condition
Fix typo
Remove git2 dependency.
Document that wildcard_imports doesn't warn about `use ...::prelude::*;`
Change changelog formatting
Update changelog_update doc to reflect the actual ordering of the changelog
Update CHANGELOG.md
````

Fixes rust-lang#70007
flip1995 pushed a commit to flip1995/rust-clippy that referenced this pull request May 5, 2020
@matthiaskrgr
submodules: update clippy from 8485d40 to 23549a8
371c74e 
Changes:
````
rustup rust-lang/rust#69738
rustup rust-lang/rust#68944
Make use of `or_patterns` feature
rustup rust-lang/rust#69589
Rustup to rust-lang/rust#69076
Don't convert Path to lossy str
Use `into_path`
Use pattern matching instead of manually checking condition
Fix typo
Remove git2 dependency.
Document that wildcard_imports doesn't warn about `use ...::prelude::*;`
Change changelog formatting
Update changelog_update doc to reflect the actual ordering of the changelog
Update CHANGELOG.md
````

Fixes #70007
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@Centril Centril Centril left review comments

@eddyb eddyb eddyb approved these changes

Reviewers whose approvals may not affect merge requirements

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.

6 participants

@mark-i-m @Centril @bors @eddyb @rust-highfive @rustbot