Skip to content

Derived Version Structs - #410

Merged
tarcieri merged 3 commits into
RustCrypto:masterfrom
npmccallum:integer
Feb 11, 2022
Merged

Derived Version Structs#410
tarcieri merged 3 commits into
RustCrypto:masterfrom
npmccallum:integer

Conversation

@npmccallum

Copy link
Copy Markdown
Contributor
  1. add a derive macro for deriving enumerations that are tagged as INTEGER.
  2. use the new macro for pkcs10::Version.
  3. add x509::Version.

Comment threadder/derive/src/lib.rs Outdated
Comment on lines 251 to 218
#[proc_macro_derive(Integer)]
#[proc_macro_error]
pub fn derive_integer(input: TokenStream) -> TokenStream {
let input = parse_macro_input!(input as DeriveInput);
DeriveEnumerated::new(input, true).to_tokens().into()
}

@tarcieritarcieriFeb 11, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This seems like you're somewhat needlessly defining another proc macro which is ultimately just a 1-argument wrapper for Enumerated.

Integer is really not very descriptive name and kind of ambiguous here: what it's doing is mapping integers to enums, just like Enumerated.

I'd suggest just making the Enumerated macro more flexible instead.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Add I said before, I already tried that. But Rust doesn't remove the type-level attribute, so it is passed through to the final AST and generates a compile error.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

That must've been a bug in your code, as I've written many proc macros that do that without issue, including this one (see TypeAttrs)

Comment on lines +22 to +24
/// Whether or not to tag the enum as an integer
integer: bool,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This seems like an inextensible way to override the tag of an Enumerated, so why not just add a #[asn1(tag = "...")] argument instead that lets you override the ENUMERATED tag however you want? Then it could potentially work for more than just INTEGER.

@npmccallum

Copy link
Copy Markdown
ContributorAuthor

@tarcieri I have implemented it with the attributes. However, the error I mentioned before has returned:

error: cannot find attribute `asn1` in this scope
--> pkcs10/src/version.rs:9:3
|
9 | #[asn1(type = "INTEGER")]
| ^^^^

This is because the derive macro outputs the asn1 attribute in the final AST. But Rust doesn't know about this attribute.

@tarcieri

Copy link
Copy Markdown
Member

@npmccallum the problem is in the definition of the Enumerated proc macro:

https://github.com/RustCrypto/formats/blob/master/der/derive/src/lib.rs#L213-L218

#[proc_macro_derive(Enumerated)]#[proc_macro_error]pubfnderive_enumerated(input:TokenStream) -> TokenStream{let input = parse_macro_input!(input asDeriveInput);DeriveEnumerated::new(input).to_tokens().into()}

You'll need to notate that it accepts an asn1 attribute. Change:

#[proc_macro_derive(Enumerated)]

to

#[proc_macro_derive(Enumerated, attributes(asn1))]

@npmccallum

Copy link
Copy Markdown
ContributorAuthor

@tarcieri THANK YOU! You have no idea how much I was pulling my hair out on that one.

Signed-off-by: Nathaniel McCallum <nathaniel@profian.com>
Signed-off-by: Nathaniel McCallum <nathaniel@profian.com>
Signed-off-by: Nathaniel McCallum <nathaniel@profian.com>
@npmccallum

Copy link
Copy Markdown
ContributorAuthor

@tarcieri This is ready for final review now.

Comment on lines +46 to +60
if let Ok(Meta::List(MetaList { nested, .. })) = attr.parse_meta() {
for meta in nested {
if let NestedMeta::Meta(Meta::NameValue(nv)) = meta {
if nv.path.is_ident("type") {
if let Lit::Str(lit) = nv.lit {
match lit.value().as_str() {
"ENUMERATED" => integer = false,
"INTEGER" => integer = true,
s => abort!(lit, "`type = \"{}\"` is unsupported", s),
}
}
}
}
}
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is... less than ideal, but I have some ideas about how to refactor this along with attribute parsing in general which I can do in a followup PR.

@tarcieri
tarcieri merged commit 9c25616 into RustCrypto:masterFeb 11, 2022
@npmccallum
npmccallum deleted the integer branch March 10, 2022 20:46
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@npmccallum@tarcieri
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Derived Version Structs by npmccallum · Pull Request #410 · RustCrypto/formats · GitHub
Skip to content

Derived Version Structs - #410

Merged
tarcieri merged 3 commits into
RustCrypto:masterfrom
npmccallum:integer
Feb 11, 2022
Merged

Derived Version Structs#410
tarcieri merged 3 commits into
RustCrypto:masterfrom
npmccallum:integer

Conversation

@npmccallum

Copy link
Copy Markdown
Contributor
  1. add a derive macro for deriving enumerations that are tagged as INTEGER.
  2. use the new macro for pkcs10::Version.
  3. add x509::Version.

Comment threadder/derive/src/lib.rs Outdated
Comment on lines 251 to 218
#[proc_macro_derive(Integer)]
#[proc_macro_error]
pub fn derive_integer(input: TokenStream) -> TokenStream {
let input = parse_macro_input!(input as DeriveInput);
DeriveEnumerated::new(input, true).to_tokens().into()
}

@tarcieritarcieriFeb 11, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This seems like you're somewhat needlessly defining another proc macro which is ultimately just a 1-argument wrapper for Enumerated.

Integer is really not very descriptive name and kind of ambiguous here: what it's doing is mapping integers to enums, just like Enumerated.

I'd suggest just making the Enumerated macro more flexible instead.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Add I said before, I already tried that. But Rust doesn't remove the type-level attribute, so it is passed through to the final AST and generates a compile error.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

That must've been a bug in your code, as I've written many proc macros that do that without issue, including this one (see TypeAttrs)

Comment on lines +22 to +24
/// Whether or not to tag the enum as an integer
integer: bool,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This seems like an inextensible way to override the tag of an Enumerated, so why not just add a #[asn1(tag = "...")] argument instead that lets you override the ENUMERATED tag however you want? Then it could potentially work for more than just INTEGER.

@npmccallum

Copy link
Copy Markdown
ContributorAuthor

@tarcieri I have implemented it with the attributes. However, the error I mentioned before has returned:

error: cannot find attribute `asn1` in this scope
--> pkcs10/src/version.rs:9:3
|
9 | #[asn1(type = "INTEGER")]
| ^^^^

This is because the derive macro outputs the asn1 attribute in the final AST. But Rust doesn't know about this attribute.

@tarcieri

Copy link
Copy Markdown
Member

@npmccallum the problem is in the definition of the Enumerated proc macro:

https://github.com/RustCrypto/formats/blob/master/der/derive/src/lib.rs#L213-L218

#[proc_macro_derive(Enumerated)]#[proc_macro_error]pubfnderive_enumerated(input:TokenStream) -> TokenStream{let input = parse_macro_input!(input asDeriveInput);DeriveEnumerated::new(input).to_tokens().into()}

You'll need to notate that it accepts an asn1 attribute. Change:

#[proc_macro_derive(Enumerated)]

to

#[proc_macro_derive(Enumerated, attributes(asn1))]

@npmccallum

Copy link
Copy Markdown
ContributorAuthor

@tarcieri THANK YOU! You have no idea how much I was pulling my hair out on that one.

Signed-off-by: Nathaniel McCallum <nathaniel@profian.com>
Signed-off-by: Nathaniel McCallum <nathaniel@profian.com>
Signed-off-by: Nathaniel McCallum <nathaniel@profian.com>
@npmccallum

Copy link
Copy Markdown
ContributorAuthor

@tarcieri This is ready for final review now.

Comment on lines +46 to +60
if let Ok(Meta::List(MetaList { nested, .. })) = attr.parse_meta() {
for meta in nested {
if let NestedMeta::Meta(Meta::NameValue(nv)) = meta {
if nv.path.is_ident("type") {
if let Lit::Str(lit) = nv.lit {
match lit.value().as_str() {
"ENUMERATED" => integer = false,
"INTEGER" => integer = true,
s => abort!(lit, "`type = \"{}\"` is unsupported", s),
}
}
}
}
}
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is... less than ideal, but I have some ideas about how to refactor this along with attribute parsing in general which I can do in a followup PR.

@tarcieri
tarcieri merged commit 9c25616 into RustCrypto:masterFeb 11, 2022
@npmccallum
npmccallum deleted the integer branch March 10, 2022 20:46
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@npmccallum@tarcieri
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Derived Version Structs by npmccallum · Pull Request #410 · RustCrypto/formats · GitHub
Skip to content

Derived Version Structs - #410

Merged
tarcieri merged 3 commits into
RustCrypto:masterfrom
npmccallum:integer
Feb 11, 2022
Merged

Derived Version Structs#410
tarcieri merged 3 commits into
RustCrypto:masterfrom
npmccallum:integer

Conversation

@npmccallum

Copy link
Copy Markdown
Contributor
  1. add a derive macro for deriving enumerations that are tagged as INTEGER.
  2. use the new macro for pkcs10::Version.
  3. add x509::Version.

Comment threadder/derive/src/lib.rs Outdated
Comment on lines 251 to 218
#[proc_macro_derive(Integer)]
#[proc_macro_error]
pub fn derive_integer(input: TokenStream) -> TokenStream {
let input = parse_macro_input!(input as DeriveInput);
DeriveEnumerated::new(input, true).to_tokens().into()
}

@tarcieritarcieriFeb 11, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This seems like you're somewhat needlessly defining another proc macro which is ultimately just a 1-argument wrapper for Enumerated.

Integer is really not very descriptive name and kind of ambiguous here: what it's doing is mapping integers to enums, just like Enumerated.

I'd suggest just making the Enumerated macro more flexible instead.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Add I said before, I already tried that. But Rust doesn't remove the type-level attribute, so it is passed through to the final AST and generates a compile error.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

That must've been a bug in your code, as I've written many proc macros that do that without issue, including this one (see TypeAttrs)

Comment on lines +22 to +24
/// Whether or not to tag the enum as an integer
integer: bool,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This seems like an inextensible way to override the tag of an Enumerated, so why not just add a #[asn1(tag = "...")] argument instead that lets you override the ENUMERATED tag however you want? Then it could potentially work for more than just INTEGER.

@npmccallum

Copy link
Copy Markdown
ContributorAuthor

@tarcieri I have implemented it with the attributes. However, the error I mentioned before has returned:

error: cannot find attribute `asn1` in this scope
--> pkcs10/src/version.rs:9:3
|
9 | #[asn1(type = "INTEGER")]
| ^^^^

This is because the derive macro outputs the asn1 attribute in the final AST. But Rust doesn't know about this attribute.

@tarcieri

Copy link
Copy Markdown
Member

@npmccallum the problem is in the definition of the Enumerated proc macro:

https://github.com/RustCrypto/formats/blob/master/der/derive/src/lib.rs#L213-L218

#[proc_macro_derive(Enumerated)]#[proc_macro_error]pubfnderive_enumerated(input:TokenStream) -> TokenStream{let input = parse_macro_input!(input asDeriveInput);DeriveEnumerated::new(input).to_tokens().into()}

You'll need to notate that it accepts an asn1 attribute. Change:

#[proc_macro_derive(Enumerated)]

to

#[proc_macro_derive(Enumerated, attributes(asn1))]

@npmccallum

Copy link
Copy Markdown
ContributorAuthor

@tarcieri THANK YOU! You have no idea how much I was pulling my hair out on that one.

Signed-off-by: Nathaniel McCallum <nathaniel@profian.com>
Signed-off-by: Nathaniel McCallum <nathaniel@profian.com>
Signed-off-by: Nathaniel McCallum <nathaniel@profian.com>
@npmccallum

Copy link
Copy Markdown
ContributorAuthor

@tarcieri This is ready for final review now.

Comment on lines +46 to +60
if let Ok(Meta::List(MetaList { nested, .. })) = attr.parse_meta() {
for meta in nested {
if let NestedMeta::Meta(Meta::NameValue(nv)) = meta {
if nv.path.is_ident("type") {
if let Lit::Str(lit) = nv.lit {
match lit.value().as_str() {
"ENUMERATED" => integer = false,
"INTEGER" => integer = true,
s => abort!(lit, "`type = \"{}\"` is unsupported", s),
}
}
}
}
}
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is... less than ideal, but I have some ideas about how to refactor this along with attribute parsing in general which I can do in a followup PR.

@tarcieri
tarcieri merged commit 9c25616 into RustCrypto:masterFeb 11, 2022
@npmccallum
npmccallum deleted the integer branch March 10, 2022 20:46
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@npmccallum@tarcieri
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Derived Version Structs by npmccallum · Pull Request #410 · RustCrypto/formats · GitHub
Skip to content

Derived Version Structs - #410

Merged
tarcieri merged 3 commits into
RustCrypto:masterfrom
npmccallum:integer
Feb 11, 2022
Merged

Derived Version Structs#410
tarcieri merged 3 commits into
RustCrypto:masterfrom
npmccallum:integer

Conversation

@npmccallum

Copy link
Copy Markdown
Contributor
  1. add a derive macro for deriving enumerations that are tagged as INTEGER.
  2. use the new macro for pkcs10::Version.
  3. add x509::Version.

Comment threadder/derive/src/lib.rs Outdated
Comment on lines 251 to 218
#[proc_macro_derive(Integer)]
#[proc_macro_error]
pub fn derive_integer(input: TokenStream) -> TokenStream {
let input = parse_macro_input!(input as DeriveInput);
DeriveEnumerated::new(input, true).to_tokens().into()
}

@tarcieritarcieriFeb 11, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This seems like you're somewhat needlessly defining another proc macro which is ultimately just a 1-argument wrapper for Enumerated.

Integer is really not very descriptive name and kind of ambiguous here: what it's doing is mapping integers to enums, just like Enumerated.

I'd suggest just making the Enumerated macro more flexible instead.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Add I said before, I already tried that. But Rust doesn't remove the type-level attribute, so it is passed through to the final AST and generates a compile error.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

That must've been a bug in your code, as I've written many proc macros that do that without issue, including this one (see TypeAttrs)

Comment on lines +22 to +24
/// Whether or not to tag the enum as an integer
integer: bool,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This seems like an inextensible way to override the tag of an Enumerated, so why not just add a #[asn1(tag = "...")] argument instead that lets you override the ENUMERATED tag however you want? Then it could potentially work for more than just INTEGER.

@npmccallum

Copy link
Copy Markdown
ContributorAuthor

@tarcieri I have implemented it with the attributes. However, the error I mentioned before has returned:

error: cannot find attribute `asn1` in this scope
--> pkcs10/src/version.rs:9:3
|
9 | #[asn1(type = "INTEGER")]
| ^^^^

This is because the derive macro outputs the asn1 attribute in the final AST. But Rust doesn't know about this attribute.

@tarcieri

Copy link
Copy Markdown
Member

@npmccallum the problem is in the definition of the Enumerated proc macro:

https://github.com/RustCrypto/formats/blob/master/der/derive/src/lib.rs#L213-L218

#[proc_macro_derive(Enumerated)]#[proc_macro_error]pubfnderive_enumerated(input:TokenStream) -> TokenStream{let input = parse_macro_input!(input asDeriveInput);DeriveEnumerated::new(input).to_tokens().into()}

You'll need to notate that it accepts an asn1 attribute. Change:

#[proc_macro_derive(Enumerated)]

to

#[proc_macro_derive(Enumerated, attributes(asn1))]

@npmccallum

Copy link
Copy Markdown
ContributorAuthor

@tarcieri THANK YOU! You have no idea how much I was pulling my hair out on that one.

Signed-off-by: Nathaniel McCallum <nathaniel@profian.com>
Signed-off-by: Nathaniel McCallum <nathaniel@profian.com>
Signed-off-by: Nathaniel McCallum <nathaniel@profian.com>
@npmccallum

Copy link
Copy Markdown
ContributorAuthor

@tarcieri This is ready for final review now.

Comment on lines +46 to +60
if let Ok(Meta::List(MetaList { nested, .. })) = attr.parse_meta() {
for meta in nested {
if let NestedMeta::Meta(Meta::NameValue(nv)) = meta {
if nv.path.is_ident("type") {
if let Lit::Str(lit) = nv.lit {
match lit.value().as_str() {
"ENUMERATED" => integer = false,
"INTEGER" => integer = true,
s => abort!(lit, "`type = \"{}\"` is unsupported", s),
}
}
}
}
}
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is... less than ideal, but I have some ideas about how to refactor this along with attribute parsing in general which I can do in a followup PR.

@tarcieri
tarcieri merged commit 9c25616 into RustCrypto:masterFeb 11, 2022
@npmccallum
npmccallum deleted the integer branch March 10, 2022 20:46
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@npmccallum@tarcieri
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Derived Version Structs by npmccallum · Pull Request #410 · RustCrypto/formats · GitHub
Skip to content

Derived Version Structs - #410

Merged
tarcieri merged 3 commits into
RustCrypto:masterfrom
npmccallum:integer
Feb 11, 2022
Merged

Derived Version Structs#410
tarcieri merged 3 commits into
RustCrypto:masterfrom
npmccallum:integer

Conversation

@npmccallum

Copy link
Copy Markdown
Contributor
  1. add a derive macro for deriving enumerations that are tagged as INTEGER.
  2. use the new macro for pkcs10::Version.
  3. add x509::Version.

Comment threadder/derive/src/lib.rs Outdated
Comment on lines 251 to 218
#[proc_macro_derive(Integer)]
#[proc_macro_error]
pub fn derive_integer(input: TokenStream) -> TokenStream {
let input = parse_macro_input!(input as DeriveInput);
DeriveEnumerated::new(input, true).to_tokens().into()
}

@tarcieritarcieriFeb 11, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This seems like you're somewhat needlessly defining another proc macro which is ultimately just a 1-argument wrapper for Enumerated.

Integer is really not very descriptive name and kind of ambiguous here: what it's doing is mapping integers to enums, just like Enumerated.

I'd suggest just making the Enumerated macro more flexible instead.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Add I said before, I already tried that. But Rust doesn't remove the type-level attribute, so it is passed through to the final AST and generates a compile error.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

That must've been a bug in your code, as I've written many proc macros that do that without issue, including this one (see TypeAttrs)

Comment on lines +22 to +24
/// Whether or not to tag the enum as an integer
integer: bool,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This seems like an inextensible way to override the tag of an Enumerated, so why not just add a #[asn1(tag = "...")] argument instead that lets you override the ENUMERATED tag however you want? Then it could potentially work for more than just INTEGER.

@npmccallum

Copy link
Copy Markdown
ContributorAuthor

@tarcieri I have implemented it with the attributes. However, the error I mentioned before has returned:

error: cannot find attribute `asn1` in this scope
--> pkcs10/src/version.rs:9:3
|
9 | #[asn1(type = "INTEGER")]
| ^^^^

This is because the derive macro outputs the asn1 attribute in the final AST. But Rust doesn't know about this attribute.

@tarcieri

Copy link
Copy Markdown
Member

@npmccallum the problem is in the definition of the Enumerated proc macro:

https://github.com/RustCrypto/formats/blob/master/der/derive/src/lib.rs#L213-L218

#[proc_macro_derive(Enumerated)]#[proc_macro_error]pubfnderive_enumerated(input:TokenStream) -> TokenStream{let input = parse_macro_input!(input asDeriveInput);DeriveEnumerated::new(input).to_tokens().into()}

You'll need to notate that it accepts an asn1 attribute. Change:

#[proc_macro_derive(Enumerated)]

to

#[proc_macro_derive(Enumerated, attributes(asn1))]

@npmccallum

Copy link
Copy Markdown
ContributorAuthor

@tarcieri THANK YOU! You have no idea how much I was pulling my hair out on that one.

Signed-off-by: Nathaniel McCallum <nathaniel@profian.com>
Signed-off-by: Nathaniel McCallum <nathaniel@profian.com>
Signed-off-by: Nathaniel McCallum <nathaniel@profian.com>
@npmccallum

Copy link
Copy Markdown
ContributorAuthor

@tarcieri This is ready for final review now.

Comment on lines +46 to +60
if let Ok(Meta::List(MetaList { nested, .. })) = attr.parse_meta() {
for meta in nested {
if let NestedMeta::Meta(Meta::NameValue(nv)) = meta {
if nv.path.is_ident("type") {
if let Lit::Str(lit) = nv.lit {
match lit.value().as_str() {
"ENUMERATED" => integer = false,
"INTEGER" => integer = true,
s => abort!(lit, "`type = \"{}\"` is unsupported", s),
}
}
}
}
}
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is... less than ideal, but I have some ideas about how to refactor this along with attribute parsing in general which I can do in a followup PR.

@tarcieri
tarcieri merged commit 9c25616 into RustCrypto:masterFeb 11, 2022
@npmccallum
npmccallum deleted the integer branch March 10, 2022 20:46
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@npmccallum@tarcieri
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Derived Version Structs by npmccallum · Pull Request #410 · RustCrypto/formats · GitHub
Skip to content

Derived Version Structs - #410

Merged
tarcieri merged 3 commits into
RustCrypto:masterfrom
npmccallum:integer
Feb 11, 2022
Merged

Derived Version Structs#410
tarcieri merged 3 commits into
RustCrypto:masterfrom
npmccallum:integer

Conversation

@npmccallum

Copy link
Copy Markdown
Contributor
  1. add a derive macro for deriving enumerations that are tagged as INTEGER.
  2. use the new macro for pkcs10::Version.
  3. add x509::Version.

Comment threadder/derive/src/lib.rs Outdated
Comment on lines 251 to 218
#[proc_macro_derive(Integer)]
#[proc_macro_error]
pub fn derive_integer(input: TokenStream) -> TokenStream {
let input = parse_macro_input!(input as DeriveInput);
DeriveEnumerated::new(input, true).to_tokens().into()
}

@tarcieritarcieriFeb 11, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This seems like you're somewhat needlessly defining another proc macro which is ultimately just a 1-argument wrapper for Enumerated.

Integer is really not very descriptive name and kind of ambiguous here: what it's doing is mapping integers to enums, just like Enumerated.

I'd suggest just making the Enumerated macro more flexible instead.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Add I said before, I already tried that. But Rust doesn't remove the type-level attribute, so it is passed through to the final AST and generates a compile error.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

That must've been a bug in your code, as I've written many proc macros that do that without issue, including this one (see TypeAttrs)

Comment on lines +22 to +24
/// Whether or not to tag the enum as an integer
integer: bool,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This seems like an inextensible way to override the tag of an Enumerated, so why not just add a #[asn1(tag = "...")] argument instead that lets you override the ENUMERATED tag however you want? Then it could potentially work for more than just INTEGER.

@npmccallum

Copy link
Copy Markdown
ContributorAuthor

@tarcieri I have implemented it with the attributes. However, the error I mentioned before has returned:

error: cannot find attribute `asn1` in this scope
--> pkcs10/src/version.rs:9:3
|
9 | #[asn1(type = "INTEGER")]
| ^^^^

This is because the derive macro outputs the asn1 attribute in the final AST. But Rust doesn't know about this attribute.

@tarcieri

Copy link
Copy Markdown
Member

@npmccallum the problem is in the definition of the Enumerated proc macro:

https://github.com/RustCrypto/formats/blob/master/der/derive/src/lib.rs#L213-L218

#[proc_macro_derive(Enumerated)]#[proc_macro_error]pubfnderive_enumerated(input:TokenStream) -> TokenStream{let input = parse_macro_input!(input asDeriveInput);DeriveEnumerated::new(input).to_tokens().into()}

You'll need to notate that it accepts an asn1 attribute. Change:

#[proc_macro_derive(Enumerated)]

to

#[proc_macro_derive(Enumerated, attributes(asn1))]

@npmccallum

Copy link
Copy Markdown
ContributorAuthor

@tarcieri THANK YOU! You have no idea how much I was pulling my hair out on that one.

Signed-off-by: Nathaniel McCallum <nathaniel@profian.com>
Signed-off-by: Nathaniel McCallum <nathaniel@profian.com>
Signed-off-by: Nathaniel McCallum <nathaniel@profian.com>
@npmccallum

Copy link
Copy Markdown
ContributorAuthor

@tarcieri This is ready for final review now.

Comment on lines +46 to +60
if let Ok(Meta::List(MetaList { nested, .. })) = attr.parse_meta() {
for meta in nested {
if let NestedMeta::Meta(Meta::NameValue(nv)) = meta {
if nv.path.is_ident("type") {
if let Lit::Str(lit) = nv.lit {
match lit.value().as_str() {
"ENUMERATED" => integer = false,
"INTEGER" => integer = true,
s => abort!(lit, "`type = \"{}\"` is unsupported", s),
}
}
}
}
}
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is... less than ideal, but I have some ideas about how to refactor this along with attribute parsing in general which I can do in a followup PR.

@tarcieri
tarcieri merged commit 9c25616 into RustCrypto:masterFeb 11, 2022
@npmccallum
npmccallum deleted the integer branch March 10, 2022 20:46
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@npmccallum@tarcieri
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); Derived Version Structs by npmccallum · Pull Request #410 · RustCrypto/formats · GitHub
Skip to content

Derived Version Structs - #410

Merged
tarcieri merged 3 commits into
RustCrypto:masterfrom
npmccallum:integer
Feb 11, 2022
Merged

Derived Version Structs#410
tarcieri merged 3 commits into
RustCrypto:masterfrom
npmccallum:integer

Conversation

@npmccallum

Copy link
Copy Markdown
Contributor
  1. add a derive macro for deriving enumerations that are tagged as INTEGER.
  2. use the new macro for pkcs10::Version.
  3. add x509::Version.

Comment threadder/derive/src/lib.rs Outdated
Comment on lines 251 to 218
#[proc_macro_derive(Integer)]
#[proc_macro_error]
pub fn derive_integer(input: TokenStream) -> TokenStream {
let input = parse_macro_input!(input as DeriveInput);
DeriveEnumerated::new(input, true).to_tokens().into()
}

@tarcieritarcieriFeb 11, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This seems like you're somewhat needlessly defining another proc macro which is ultimately just a 1-argument wrapper for Enumerated.

Integer is really not very descriptive name and kind of ambiguous here: what it's doing is mapping integers to enums, just like Enumerated.

I'd suggest just making the Enumerated macro more flexible instead.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Add I said before, I already tried that. But Rust doesn't remove the type-level attribute, so it is passed through to the final AST and generates a compile error.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

That must've been a bug in your code, as I've written many proc macros that do that without issue, including this one (see TypeAttrs)

Comment on lines +22 to +24
/// Whether or not to tag the enum as an integer
integer: bool,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This seems like an inextensible way to override the tag of an Enumerated, so why not just add a #[asn1(tag = "...")] argument instead that lets you override the ENUMERATED tag however you want? Then it could potentially work for more than just INTEGER.

@npmccallum

Copy link
Copy Markdown
ContributorAuthor

@tarcieri I have implemented it with the attributes. However, the error I mentioned before has returned:

error: cannot find attribute `asn1` in this scope
--> pkcs10/src/version.rs:9:3
|
9 | #[asn1(type = "INTEGER")]
| ^^^^

This is because the derive macro outputs the asn1 attribute in the final AST. But Rust doesn't know about this attribute.

@tarcieri

Copy link
Copy Markdown
Member

@npmccallum the problem is in the definition of the Enumerated proc macro:

https://github.com/RustCrypto/formats/blob/master/der/derive/src/lib.rs#L213-L218

#[proc_macro_derive(Enumerated)]#[proc_macro_error]pubfnderive_enumerated(input:TokenStream) -> TokenStream{let input = parse_macro_input!(input asDeriveInput);DeriveEnumerated::new(input).to_tokens().into()}

You'll need to notate that it accepts an asn1 attribute. Change:

#[proc_macro_derive(Enumerated)]

to

#[proc_macro_derive(Enumerated, attributes(asn1))]

@npmccallum

Copy link
Copy Markdown
ContributorAuthor

@tarcieri THANK YOU! You have no idea how much I was pulling my hair out on that one.

Signed-off-by: Nathaniel McCallum <nathaniel@profian.com>
Signed-off-by: Nathaniel McCallum <nathaniel@profian.com>
Signed-off-by: Nathaniel McCallum <nathaniel@profian.com>
@npmccallum

Copy link
Copy Markdown
ContributorAuthor

@tarcieri This is ready for final review now.

Comment on lines +46 to +60
if let Ok(Meta::List(MetaList { nested, .. })) = attr.parse_meta() {
for meta in nested {
if let NestedMeta::Meta(Meta::NameValue(nv)) = meta {
if nv.path.is_ident("type") {
if let Lit::Str(lit) = nv.lit {
match lit.value().as_str() {
"ENUMERATED" => integer = false,
"INTEGER" => integer = true,
s => abort!(lit, "`type = \"{}\"` is unsupported", s),
}
}
}
}
}
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is... less than ideal, but I have some ideas about how to refactor this along with attribute parsing in general which I can do in a followup PR.

@tarcieri
tarcieri merged commit 9c25616 into RustCrypto:masterFeb 11, 2022
@npmccallum
npmccallum deleted the integer branch March 10, 2022 20:46
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@npmccallum@tarcieri