Skip to content

Fix #[warn(clippy::try_err)] in ser_macros.rs#1032

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

Merged
TheBlueMatt merged 2 commits into from
Aug 2, 2021
Merged

Fix #[warn(clippy::try_err)] in ser_macros.rs #1032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58a4dc0
Fix #[warn(clippy::try_err)] in ser_macros.rs
jkczyz Aug 2, 2021
b4c3a33
Fail linter on #[warn(clippy::try_err)]
jkczyz Aug 2, 2021
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -262,4 +262,4 @@ jobs:
rustup component add clippy
- name: Run default clippy linting
run: |
cargo clippy -- -Aclippy::erasing_op -Aclippy::never_loop -Aclippy::if_same_then_else
cargo clippy -- -Aclippy::erasing_op -Aclippy::never_loop -Aclippy::if_same_then_else -Dclippy::try_err
18 changes: 9 additions & 9 deletions lightning/src/util/ser_macros.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ macro_rules! check_tlv_order {
#[allow(unused_comparisons)] // Note that $type may be 0 making the second comparison always true
let invalid_order = ($last_seen_type.is_none() || $last_seen_type.unwrap() < $type) && $typ.0 > $type;
if invalid_order {
Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
}
}};
($last_seen_type: expr, $typ: expr, $type: expr, option) => {{
Expand All@@ -109,7 +109,7 @@ macro_rules! check_missing_tlv {
#[allow(unused_comparisons)] // Note that $type may be 0 making the second comparison always true
let missing_req_type = $last_seen_type.is_none() || $last_seen_type.unwrap() < $type;
if missing_req_type {
Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
}
}};
($last_seen_type: expr, $type: expr, vec_type) => {{
Expand DownExpand Up@@ -149,20 +149,20 @@ macro_rules! decode_tlv_stream {
match ser::Readable::read(&mut tracking_reader) {
Err(DecodeError::ShortRead) => {
if !tracking_reader.have_read {
break 'tlv_read
break 'tlv_read;
} else {
Err(DecodeError::ShortRead)?
return Err(DecodeError::ShortRead);
}
},
Err(e) => Err(e)?,
Err(e) => return Err(e),
Ok(t) => t,
}
};

// Types must be unique and monotonically increasing:
match last_seen_type {
Some(t) if typ.0 <= t => {
Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
},
_ => {},
}
Expand All@@ -180,11 +180,11 @@ macro_rules! decode_tlv_stream {
decode_tlv!(s, $field, $fieldty);
if s.bytes_remain() {
s.eat_remaining()?; // Return ShortRead if there's actually not enough bytes
Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
}
},)*
x if x % 2 == 0 => {
Err(DecodeError::UnknownRequiredFeature)?
return Err(DecodeError::UnknownRequiredFeature);
},
_ => {},
}
Expand DownExpand Up@@ -490,7 +490,7 @@ macro_rules! impl_writeable_tlv_based_enum {
Ok($st::$tuple_variant_name(Readable::read(reader)?))
}),*
_ => {
Err(DecodeError::UnknownRequiredFeature)?
Err(DecodeError::UnknownRequiredFeature)
},
}
}
Expand Down
, '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" + '
Fix #[warn(clippy::try_err)] in ser_macros.rs by jkczyz · Pull Request #1032 · lightningdevkit/rust-lightning · GitHub
Skip to content
Fix #[warn(clippy::try_err)] in ser_macros.rs#1032

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

 Merged

TheBlueMatt
merged 2 commits into

from

Aug 2, 2021
 Merged


Fix #[warn(clippy::try_err)] in ser_macros.rs
#1032
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
58a4dc0

Fix #[warn(clippy::try_err)] in ser_macros.rs


jkczyz Aug 2, 2021
b4c3a33

Fail linter on #[warn(clippy::try_err)]


jkczyz Aug 2, 2021

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


2 changes: 1 addition & 1 deletion
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -262,4 +262,4 @@ jobs:
 rustup component add clippy
 - name: Run default clippy linting
 run: |
 cargo clippy -- -Aclippy::erasing_op -Aclippy::never_loop -Aclippy::if_same_then_else
 cargo clippy -- -Aclippy::erasing_op -Aclippy::never_loop -Aclippy::if_same_then_else -Dclippy::try_err

18 changes: 9 additions & 9 deletions
lightning/src/util/ser_macros.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ macro_rules! check_tlv_order {
 #[allow(unused_comparisons)] // Note that $type may be 0 making the second comparison always true
 let invalid_order = ($last_seen_type.is_none() || $last_seen_type.unwrap() < $type) && $typ.0 > $type;
 if invalid_order {
 Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
 }
	}};
	($last_seen_type: expr, $typ: expr, $type: expr, option) => {{
Expand All@@ -109,7 +109,7 @@ macro_rules! check_missing_tlv {
 #[allow(unused_comparisons)] // Note that $type may be 0 making the second comparison always true
 let missing_req_type = $last_seen_type.is_none() || $last_seen_type.unwrap() < $type;
 if missing_req_type {
 Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
 }
	}};
	($last_seen_type: expr, $type: expr, vec_type) => {{
Expand DownExpand Up@@ -149,20 +149,20 @@ macro_rules! decode_tlv_stream {
 match ser::Readable::read(&mut tracking_reader) {
 Err(DecodeError::ShortRead) => {
 if !tracking_reader.have_read {
 break 'tlv_read
 break 'tlv_read;
 } else {
 Err(DecodeError::ShortRead)?
return Err(DecodeError::ShortRead);
 }
 },
 Err(e) => Err(e)?,
 Err(e) => return Err(e),
 Ok(t) => t,
 }
 };

 // Types must be unique and monotonically increasing:
 match last_seen_type {
 Some(t) if typ.0 <= t => {
 Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
 },
 _ => {},
 }
Expand All@@ -180,11 +180,11 @@ macro_rules! decode_tlv_stream {
 decode_tlv!(s, $field, $fieldty);
 if s.bytes_remain() {
 s.eat_remaining()?; // Return ShortRead if there's actually not enough bytes
 Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
 }
 },)*
 x if x % 2 == 0 => {
 Err(DecodeError::UnknownRequiredFeature)?
return Err(DecodeError::UnknownRequiredFeature);
 },
 _ => {},
 }
Expand DownExpand Up@@ -490,7 +490,7 @@ macro_rules! impl_writeable_tlv_based_enum {
 Ok($st::$tuple_variant_name(Readable::read(reader)?))
 }),*
 _ => {
 Err(DecodeError::UnknownRequiredFeature)?
 Err(DecodeError::UnknownRequiredFeature)
 },
 }
 }
Expand Down

, '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('^' + ".*" + '
Fix #[warn(clippy::try_err)] in ser_macros.rs by jkczyz · Pull Request #1032 · lightningdevkit/rust-lightning · GitHub
Skip to content
Fix #[warn(clippy::try_err)] in ser_macros.rs#1032

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

 Merged

TheBlueMatt
merged 2 commits into

from

Aug 2, 2021
 Merged


Fix #[warn(clippy::try_err)] in ser_macros.rs
#1032
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
58a4dc0

Fix #[warn(clippy::try_err)] in ser_macros.rs


jkczyz Aug 2, 2021
b4c3a33

Fail linter on #[warn(clippy::try_err)]


jkczyz Aug 2, 2021

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


2 changes: 1 addition & 1 deletion
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -262,4 +262,4 @@ jobs:
 rustup component add clippy
 - name: Run default clippy linting
 run: |
 cargo clippy -- -Aclippy::erasing_op -Aclippy::never_loop -Aclippy::if_same_then_else
 cargo clippy -- -Aclippy::erasing_op -Aclippy::never_loop -Aclippy::if_same_then_else -Dclippy::try_err

18 changes: 9 additions & 9 deletions
lightning/src/util/ser_macros.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ macro_rules! check_tlv_order {
 #[allow(unused_comparisons)] // Note that $type may be 0 making the second comparison always true
 let invalid_order = ($last_seen_type.is_none() || $last_seen_type.unwrap() < $type) && $typ.0 > $type;
 if invalid_order {
 Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
 }
	}};
	($last_seen_type: expr, $typ: expr, $type: expr, option) => {{
Expand All@@ -109,7 +109,7 @@ macro_rules! check_missing_tlv {
 #[allow(unused_comparisons)] // Note that $type may be 0 making the second comparison always true
 let missing_req_type = $last_seen_type.is_none() || $last_seen_type.unwrap() < $type;
 if missing_req_type {
 Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
 }
	}};
	($last_seen_type: expr, $type: expr, vec_type) => {{
Expand DownExpand Up@@ -149,20 +149,20 @@ macro_rules! decode_tlv_stream {
 match ser::Readable::read(&mut tracking_reader) {
 Err(DecodeError::ShortRead) => {
 if !tracking_reader.have_read {
 break 'tlv_read
 break 'tlv_read;
 } else {
 Err(DecodeError::ShortRead)?
return Err(DecodeError::ShortRead);
 }
 },
 Err(e) => Err(e)?,
 Err(e) => return Err(e),
 Ok(t) => t,
 }
 };

 // Types must be unique and monotonically increasing:
 match last_seen_type {
 Some(t) if typ.0 <= t => {
 Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
 },
 _ => {},
 }
Expand All@@ -180,11 +180,11 @@ macro_rules! decode_tlv_stream {
 decode_tlv!(s, $field, $fieldty);
 if s.bytes_remain() {
 s.eat_remaining()?; // Return ShortRead if there's actually not enough bytes
 Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
 }
 },)*
 x if x % 2 == 0 => {
 Err(DecodeError::UnknownRequiredFeature)?
return Err(DecodeError::UnknownRequiredFeature);
 },
 _ => {},
 }
Expand DownExpand Up@@ -490,7 +490,7 @@ macro_rules! impl_writeable_tlv_based_enum {
 Ok($st::$tuple_variant_name(Readable::read(reader)?))
 }),*
 _ => {
 Err(DecodeError::UnknownRequiredFeature)?
 Err(DecodeError::UnknownRequiredFeature)
 },
 }
 }
Expand Down

, '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('^' + ".*" + '
Fix #[warn(clippy::try_err)] in ser_macros.rs by jkczyz · Pull Request #1032 · lightningdevkit/rust-lightning · GitHub
Skip to content
Fix #[warn(clippy::try_err)] in ser_macros.rs#1032

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

 Merged

TheBlueMatt
merged 2 commits into

from

Aug 2, 2021
 Merged


Fix #[warn(clippy::try_err)] in ser_macros.rs
#1032
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
58a4dc0

Fix #[warn(clippy::try_err)] in ser_macros.rs


jkczyz Aug 2, 2021
b4c3a33

Fail linter on #[warn(clippy::try_err)]


jkczyz Aug 2, 2021

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


2 changes: 1 addition & 1 deletion
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -262,4 +262,4 @@ jobs:
 rustup component add clippy
 - name: Run default clippy linting
 run: |
 cargo clippy -- -Aclippy::erasing_op -Aclippy::never_loop -Aclippy::if_same_then_else
 cargo clippy -- -Aclippy::erasing_op -Aclippy::never_loop -Aclippy::if_same_then_else -Dclippy::try_err

18 changes: 9 additions & 9 deletions
lightning/src/util/ser_macros.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ macro_rules! check_tlv_order {
 #[allow(unused_comparisons)] // Note that $type may be 0 making the second comparison always true
 let invalid_order = ($last_seen_type.is_none() || $last_seen_type.unwrap() < $type) && $typ.0 > $type;
 if invalid_order {
 Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
 }
	}};
	($last_seen_type: expr, $typ: expr, $type: expr, option) => {{
Expand All@@ -109,7 +109,7 @@ macro_rules! check_missing_tlv {
 #[allow(unused_comparisons)] // Note that $type may be 0 making the second comparison always true
 let missing_req_type = $last_seen_type.is_none() || $last_seen_type.unwrap() < $type;
 if missing_req_type {
 Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
 }
	}};
	($last_seen_type: expr, $type: expr, vec_type) => {{
Expand DownExpand Up@@ -149,20 +149,20 @@ macro_rules! decode_tlv_stream {
 match ser::Readable::read(&mut tracking_reader) {
 Err(DecodeError::ShortRead) => {
 if !tracking_reader.have_read {
 break 'tlv_read
 break 'tlv_read;
 } else {
 Err(DecodeError::ShortRead)?
return Err(DecodeError::ShortRead);
 }
 },
 Err(e) => Err(e)?,
 Err(e) => return Err(e),
 Ok(t) => t,
 }
 };

 // Types must be unique and monotonically increasing:
 match last_seen_type {
 Some(t) if typ.0 <= t => {
 Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
 },
 _ => {},
 }
Expand All@@ -180,11 +180,11 @@ macro_rules! decode_tlv_stream {
 decode_tlv!(s, $field, $fieldty);
 if s.bytes_remain() {
 s.eat_remaining()?; // Return ShortRead if there's actually not enough bytes
 Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
 }
 },)*
 x if x % 2 == 0 => {
 Err(DecodeError::UnknownRequiredFeature)?
return Err(DecodeError::UnknownRequiredFeature);
 },
 _ => {},
 }
Expand DownExpand Up@@ -490,7 +490,7 @@ macro_rules! impl_writeable_tlv_based_enum {
 Ok($st::$tuple_variant_name(Readable::read(reader)?))
 }),*
 _ => {
 Err(DecodeError::UnknownRequiredFeature)?
 Err(DecodeError::UnknownRequiredFeature)
 },
 }
 }
Expand Down

, '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" + '
Fix #[warn(clippy::try_err)] in ser_macros.rs by jkczyz · Pull Request #1032 · lightningdevkit/rust-lightning · GitHub
Skip to content
Fix #[warn(clippy::try_err)] in ser_macros.rs#1032

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

 Merged

TheBlueMatt
merged 2 commits into

from

Aug 2, 2021
 Merged


Fix #[warn(clippy::try_err)] in ser_macros.rs
#1032
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
58a4dc0

Fix #[warn(clippy::try_err)] in ser_macros.rs


jkczyz Aug 2, 2021
b4c3a33

Fail linter on #[warn(clippy::try_err)]


jkczyz Aug 2, 2021

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


2 changes: 1 addition & 1 deletion
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -262,4 +262,4 @@ jobs:
 rustup component add clippy
 - name: Run default clippy linting
 run: |
 cargo clippy -- -Aclippy::erasing_op -Aclippy::never_loop -Aclippy::if_same_then_else
 cargo clippy -- -Aclippy::erasing_op -Aclippy::never_loop -Aclippy::if_same_then_else -Dclippy::try_err

18 changes: 9 additions & 9 deletions
lightning/src/util/ser_macros.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ macro_rules! check_tlv_order {
 #[allow(unused_comparisons)] // Note that $type may be 0 making the second comparison always true
 let invalid_order = ($last_seen_type.is_none() || $last_seen_type.unwrap() < $type) && $typ.0 > $type;
 if invalid_order {
 Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
 }
	}};
	($last_seen_type: expr, $typ: expr, $type: expr, option) => {{
Expand All@@ -109,7 +109,7 @@ macro_rules! check_missing_tlv {
 #[allow(unused_comparisons)] // Note that $type may be 0 making the second comparison always true
 let missing_req_type = $last_seen_type.is_none() || $last_seen_type.unwrap() < $type;
 if missing_req_type {
 Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
 }
	}};
	($last_seen_type: expr, $type: expr, vec_type) => {{
Expand DownExpand Up@@ -149,20 +149,20 @@ macro_rules! decode_tlv_stream {
 match ser::Readable::read(&mut tracking_reader) {
 Err(DecodeError::ShortRead) => {
 if !tracking_reader.have_read {
 break 'tlv_read
 break 'tlv_read;
 } else {
 Err(DecodeError::ShortRead)?
return Err(DecodeError::ShortRead);
 }
 },
 Err(e) => Err(e)?,
 Err(e) => return Err(e),
 Ok(t) => t,
 }
 };

 // Types must be unique and monotonically increasing:
 match last_seen_type {
 Some(t) if typ.0 <= t => {
 Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
 },
 _ => {},
 }
Expand All@@ -180,11 +180,11 @@ macro_rules! decode_tlv_stream {
 decode_tlv!(s, $field, $fieldty);
 if s.bytes_remain() {
 s.eat_remaining()?; // Return ShortRead if there's actually not enough bytes
 Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
 }
 },)*
 x if x % 2 == 0 => {
 Err(DecodeError::UnknownRequiredFeature)?
return Err(DecodeError::UnknownRequiredFeature);
 },
 _ => {},
 }
Expand DownExpand Up@@ -490,7 +490,7 @@ macro_rules! impl_writeable_tlv_based_enum {
 Ok($st::$tuple_variant_name(Readable::read(reader)?))
 }),*
 _ => {
 Err(DecodeError::UnknownRequiredFeature)?
 Err(DecodeError::UnknownRequiredFeature)
 },
 }
 }
Expand Down

, '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('^' + ".*" + '
Fix #[warn(clippy::try_err)] in ser_macros.rs by jkczyz · Pull Request #1032 · lightningdevkit/rust-lightning · GitHub
Skip to content
Fix #[warn(clippy::try_err)] in ser_macros.rs#1032

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

 Merged

TheBlueMatt
merged 2 commits into

from

Aug 2, 2021
 Merged


Fix #[warn(clippy::try_err)] in ser_macros.rs
#1032
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
58a4dc0

Fix #[warn(clippy::try_err)] in ser_macros.rs


jkczyz Aug 2, 2021
b4c3a33

Fail linter on #[warn(clippy::try_err)]


jkczyz Aug 2, 2021

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


2 changes: 1 addition & 1 deletion
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -262,4 +262,4 @@ jobs:
 rustup component add clippy
 - name: Run default clippy linting
 run: |
 cargo clippy -- -Aclippy::erasing_op -Aclippy::never_loop -Aclippy::if_same_then_else
 cargo clippy -- -Aclippy::erasing_op -Aclippy::never_loop -Aclippy::if_same_then_else -Dclippy::try_err

18 changes: 9 additions & 9 deletions
lightning/src/util/ser_macros.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ macro_rules! check_tlv_order {
 #[allow(unused_comparisons)] // Note that $type may be 0 making the second comparison always true
 let invalid_order = ($last_seen_type.is_none() || $last_seen_type.unwrap() < $type) && $typ.0 > $type;
 if invalid_order {
 Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
 }
	}};
	($last_seen_type: expr, $typ: expr, $type: expr, option) => {{
Expand All@@ -109,7 +109,7 @@ macro_rules! check_missing_tlv {
 #[allow(unused_comparisons)] // Note that $type may be 0 making the second comparison always true
 let missing_req_type = $last_seen_type.is_none() || $last_seen_type.unwrap() < $type;
 if missing_req_type {
 Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
 }
	}};
	($last_seen_type: expr, $type: expr, vec_type) => {{
Expand DownExpand Up@@ -149,20 +149,20 @@ macro_rules! decode_tlv_stream {
 match ser::Readable::read(&mut tracking_reader) {
 Err(DecodeError::ShortRead) => {
 if !tracking_reader.have_read {
 break 'tlv_read
 break 'tlv_read;
 } else {
 Err(DecodeError::ShortRead)?
return Err(DecodeError::ShortRead);
 }
 },
 Err(e) => Err(e)?,
 Err(e) => return Err(e),
 Ok(t) => t,
 }
 };

 // Types must be unique and monotonically increasing:
 match last_seen_type {
 Some(t) if typ.0 <= t => {
 Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
 },
 _ => {},
 }
Expand All@@ -180,11 +180,11 @@ macro_rules! decode_tlv_stream {
 decode_tlv!(s, $field, $fieldty);
 if s.bytes_remain() {
 s.eat_remaining()?; // Return ShortRead if there's actually not enough bytes
 Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
 }
 },)*
 x if x % 2 == 0 => {
 Err(DecodeError::UnknownRequiredFeature)?
return Err(DecodeError::UnknownRequiredFeature);
 },
 _ => {},
 }
Expand DownExpand Up@@ -490,7 +490,7 @@ macro_rules! impl_writeable_tlv_based_enum {
 Ok($st::$tuple_variant_name(Readable::read(reader)?))
 }),*
 _ => {
 Err(DecodeError::UnknownRequiredFeature)?
 Err(DecodeError::UnknownRequiredFeature)
 },
 }
 }
Expand Down

, '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); }
})();
})();
Fix #[warn(clippy::try_err)] in ser_macros.rs by jkczyz · Pull Request #1032 · lightningdevkit/rust-lightning · GitHub
Skip to content
Fix #[warn(clippy::try_err)] in ser_macros.rs#1032

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

 Merged

TheBlueMatt
merged 2 commits into

from

Aug 2, 2021
 Merged


Fix #[warn(clippy::try_err)] in ser_macros.rs
#1032
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
58a4dc0

Fix #[warn(clippy::try_err)] in ser_macros.rs


jkczyz Aug 2, 2021
b4c3a33

Fail linter on #[warn(clippy::try_err)]


jkczyz Aug 2, 2021

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


2 changes: 1 addition & 1 deletion
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -262,4 +262,4 @@ jobs:
 rustup component add clippy
 - name: Run default clippy linting
 run: |
 cargo clippy -- -Aclippy::erasing_op -Aclippy::never_loop -Aclippy::if_same_then_else
 cargo clippy -- -Aclippy::erasing_op -Aclippy::never_loop -Aclippy::if_same_then_else -Dclippy::try_err

18 changes: 9 additions & 9 deletions
lightning/src/util/ser_macros.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ macro_rules! check_tlv_order {
 #[allow(unused_comparisons)] // Note that $type may be 0 making the second comparison always true
 let invalid_order = ($last_seen_type.is_none() || $last_seen_type.unwrap() < $type) && $typ.0 > $type;
 if invalid_order {
 Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
 }
	}};
	($last_seen_type: expr, $typ: expr, $type: expr, option) => {{
Expand All@@ -109,7 +109,7 @@ macro_rules! check_missing_tlv {
 #[allow(unused_comparisons)] // Note that $type may be 0 making the second comparison always true
 let missing_req_type = $last_seen_type.is_none() || $last_seen_type.unwrap() < $type;
 if missing_req_type {
 Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
 }
	}};
	($last_seen_type: expr, $type: expr, vec_type) => {{
Expand DownExpand Up@@ -149,20 +149,20 @@ macro_rules! decode_tlv_stream {
 match ser::Readable::read(&mut tracking_reader) {
 Err(DecodeError::ShortRead) => {
 if !tracking_reader.have_read {
 break 'tlv_read
 break 'tlv_read;
 } else {
 Err(DecodeError::ShortRead)?
return Err(DecodeError::ShortRead);
 }
 },
 Err(e) => Err(e)?,
 Err(e) => return Err(e),
 Ok(t) => t,
 }
 };

 // Types must be unique and monotonically increasing:
 match last_seen_type {
 Some(t) if typ.0 <= t => {
 Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
 },
 _ => {},
 }
Expand All@@ -180,11 +180,11 @@ macro_rules! decode_tlv_stream {
 decode_tlv!(s, $field, $fieldty);
 if s.bytes_remain() {
 s.eat_remaining()?; // Return ShortRead if there's actually not enough bytes
 Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
 }
 },)*
 x if x % 2 == 0 => {
 Err(DecodeError::UnknownRequiredFeature)?
return Err(DecodeError::UnknownRequiredFeature);
 },
 _ => {},
 }
Expand DownExpand Up@@ -490,7 +490,7 @@ macro_rules! impl_writeable_tlv_based_enum {
 Ok($st::$tuple_variant_name(Readable::read(reader)?))
 }),*
 _ => {
 Err(DecodeError::UnknownRequiredFeature)?
 Err(DecodeError::UnknownRequiredFeature)
 },
 }
 }
Expand Down