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

`MethodSig` -> `FnSig` & Use it in `ItemKind::Fn` #66188

Merged
merged 4 commits into from Nov 8, 2019

Conversation

@Centril
Copy link
Member

Centril commented Nov 7, 2019

In both AST & HIR, rename MethodSig to FnSig and then proceed to use it in ItemKind::Fn so that the overall structure is more regular.

r? @davidtwco

Copy link
Member

davidtwco left a comment

LGTM!

@davidtwco

This comment has been minimized.

Copy link
Member

davidtwco commented Nov 7, 2019

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Nov 7, 2019

📌 Commit 4189bbe has been approved by davidtwco

@petrochenkov petrochenkov self-assigned this Nov 7, 2019
@petrochenkov petrochenkov removed their assignment Nov 7, 2019
bors added a commit that referenced this pull request Nov 8, 2019
Rollup of 8 pull requests

Successful merges:

 - #65554 (Enhance the documentation of BufReader for potential data loss)
 - #65580 (Add `MaybeUninit` methods `uninit_array`, `slice_get_ref`, `slice_get_mut`)
 - #66049 (consistent handling of missing sysroot spans)
 - #66056 (rustc_metadata: Some reorganization of the module structure)
 - #66123 (No more hidden elements)
 - #66157 (Improve math log documentation examples)
 - #66165 (Ignore these tests ,since the called commands doesn't exist in VxWorks)
 - #66190 (rustc_target: inline abi::FloatTy into abi::Primitive.)

Failed merges:

 - #66188 (`MethodSig` -> `FnSig` & Use it in `ItemKind::Fn`)

r? @ghost
@bors

This comment was marked as resolved.

Copy link
Contributor

bors commented Nov 8, 2019

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

@Centril Centril force-pushed the Centril:fnsig branch from 4189bbe to b4c6abc Nov 8, 2019
@Centril

This comment has been minimized.

Copy link
Member Author

Centril commented Nov 8, 2019

@bors r=davidtwco

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Nov 8, 2019

📌 Commit b4c6abc has been approved by davidtwco

Centril added a commit to Centril/rust that referenced this pull request Nov 8, 2019
`MethodSig` -> `FnSig` & Use it in `ItemKind::Fn`

In both AST & HIR, rename `MethodSig` to `FnSig` and then proceed to use it in `ItemKind::Fn` so that the overall structure is more regular.

r? @davidtwco
bors added a commit that referenced this pull request Nov 8, 2019
Rollup of 5 pull requests

Successful merges:

 - #65785 (Transition future compat lints to {ERROR, DENY} - Take 2)
 - #66043 (rename Memory::get methods to get_raw to indicate their unchecked nature)
 - #66154 (miri: Rename to_{u,i}size to to_machine_{u,i}size)
 - #66161 (Update rustc-guide)
 - #66188 (`MethodSig` -> `FnSig` & Use it in `ItemKind::Fn`)

Failed merges:

r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Nov 8, 2019
`MethodSig` -> `FnSig` & Use it in `ItemKind::Fn`

In both AST & HIR, rename `MethodSig` to `FnSig` and then proceed to use it in `ItemKind::Fn` so that the overall structure is more regular.

r? @davidtwco
bors added a commit that referenced this pull request Nov 8, 2019
Rollup of 5 pull requests

Successful merges:

 - #65785 (Transition future compat lints to {ERROR, DENY} - Take 2)
 - #66007 (Remove "here" from "expected one of X here")
 - #66043 (rename Memory::get methods to get_raw to indicate their unchecked nature)
 - #66154 (miri: Rename to_{u,i}size to to_machine_{u,i}size)
 - #66188 (`MethodSig` -> `FnSig` & Use it in `ItemKind::Fn`)

Failed merges:

r? @ghost
@bors bors merged commit b4c6abc into rust-lang:master Nov 8, 2019
4 checks passed
4 checks passed
pr Build #20191108.20 succeeded
Details
pr (Linux mingw-check) Linux mingw-check succeeded
Details
pr (Linux x86_64-gnu-llvm-6.0) Linux x86_64-gnu-llvm-6.0 succeeded
Details
pr (Linux x86_64-gnu-tools) Linux x86_64-gnu-tools succeeded
Details
@Centril Centril deleted the Centril:fnsig branch Nov 8, 2019
HMPerson1 added a commit to HMPerson1/rust-clippy that referenced this pull request Nov 8, 2019
bors added a commit to rust-lang/rust-clippy that referenced this pull request Nov 8, 2019
Rustup rust-lang/rust#66188

changelog: none
bors added a commit to rust-lang/rust-clippy that referenced this pull request Nov 8, 2019
Rustup rust-lang/rust#66188

changelog: none
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.