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

fix: prohibit NEAR function generics #980

Merged
merged 12 commits into from
Jan 23, 2023
Merged

fix: prohibit NEAR function generics #980

Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4828408
prohibit near function generics
itegulov Nov 28, 2022
9603c2b
appease clippy
itegulov Nov 28, 2022
0d1db68
refactor impl info extraction logic
itegulov Nov 28, 2022
23789a2
appease clippy
itegulov Nov 28, 2022
b330317
add a compilation test
itegulov Nov 28, 2022
868154e
Merge remote-tracking branch 'origin/master' into daniyar/prohibit-ge…
itegulov Jan 23, 2023
90ea780
address comments
itegulov Jan 23, 2023
88064c3
Merge remote-tracking branch 'origin/master' into daniyar/prohibit-ge…
itegulov Jan 23, 2023
5966217
point error to the specific generics
itegulov Jan 23, 2023
9f70a61
add missing whitespaces
itegulov Jan 23, 2023
d180e8d
Merge remote-tracking branch 'origin/master' into daniyar/prohibit-ge…
itegulov Jan 23, 2023
232a4b4
Merge branch 'master' into daniyar/prohibit-generics
itegulov Jan 23, 2023
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
6 changes: 6 additions & 0 deletions near-sdk-macros/src/core_impl/info_extractor/attr_sig_info.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@ impl AttrSigInfo {
original_attrs: &mut Vec<Attribute>,
original_sig: &mut Signature,
) -> syn::Result<Self> {
if !original_sig.generics.params.is_empty() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's maybe only do this for pub-lic functions?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dude, why is this method even being called for private methods 🤔

I am guessing there are two separate logic flows happening in this method: checking that there are no weird variadic async etc modifiers (that is supposed to work on both private and public functions) and processing near_bindgen stuff (only for public functions). I will refactor this.

return Err(Error::new(
original_sig.generics.span(),
"Contract API is not allowed to have generics.",
));
}
if original_sig.asyncness.is_some() {
return Err(Error::new(
original_sig.span(),
Expand Down