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.

Sign up for GitHub

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

More Method -> AssocFn renaming #69738

Merged
merged 3 commits into from
Mar 16, 2020
Merged

More Method -> AssocFn renaming #69738

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7bd8ce2
More Method->Fn renaming
mark-i-m Mar 5, 2020
e3c15ae
update comment
mark-i-m Mar 7, 2020
1b92e86
MethodData -> AssocFnData
mark-i-m Mar 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
MethodData -> AssocFnData
  • Loading branch information
@mark-i-m
mark-i-m committed Mar 16, 2020
commit 1b92e86a1c70533d76b5ea3937bdaabba9653f2c
4 changes: 2 additions & 2 deletions src/librustc_metadata/rmeta/encoder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,7 @@ impl EncodeContext<'tcx> {
} else {
bug!()
};
EntryKind::AssocFn(self.lazy(MethodData {
EntryKind::AssocFn(self.lazy(AssocFnData {
fn_data,
container,
has_self: trait_item.method_has_self_argument,
Expand Down Expand Up @@ -903,7 +903,7 @@ impl EncodeContext<'tcx> {
} else {
bug!()
};
EntryKind::AssocFn(self.lazy(MethodData {
EntryKind::AssocFn(self.lazy(AssocFnData {
fn_data,
container,
has_self: impl_item.method_has_self_argument,
Expand Down
4 changes: 2 additions & 2 deletions src/librustc_metadata/rmeta/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ enum EntryKind {
Generator(hir::GeneratorKind),
Trait(Lazy<TraitData>),
Impl(Lazy<ImplData>),
AssocFn(Lazy<MethodData>),
AssocFn(Lazy<AssocFnData>),
AssocType(AssocContainer),
AssocOpaqueTy(AssocContainer),
AssocConst(AssocContainer, mir::ConstQualifs, Lazy<RenderedConst>),
Expand Down Expand Up @@ -392,7 +392,7 @@ impl AssocContainer {
}

#[derive(RustcEncodable, RustcDecodable)]
struct MethodData {
struct AssocFnData {
fn_data: FnData,
container: AssocContainer,
has_self: bool,
Expand Down