') + ')', '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('^' + ".*" + ', '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" + ', '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('^' + ".*" + ', '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

Merged
TheBlueMatt merged 2 commits into
lightningdevkit:mainfrom
jkczyz:2021-08-clippy
Aug 2, 2021
Merged

Fix #[warn(clippy::try_err)] in ser_macros.rs#1032
TheBlueMatt merged 2 commits into
lightningdevkit:mainfrom
jkczyz:2021-08-clippy

Conversation

@jkczyz

@jkczyzjkczyz commented Aug 2, 2021

Copy link
Copy Markdown
Contributor

Some heavily used macros are using ? directly on an Err. Using a return is easier to read and removes hundreds of linter warnings.

https://rust-lang.github.io/rust-clippy/master/index.html#try_err

@TheBlueMatt

TheBlueMatt commented Aug 2, 2021

Copy link
Copy Markdown
Collaborator

SGTM, can we set this clippy lint to required so that the lint CI check fails here?

@codecov

codecovBot commented Aug 2, 2021•
edited
Loading

Copy link
Copy Markdown

Codecov Report

Merging #1032 (b4c3a33) into main (bee9a1e) will increase coverage by 0.00%.
The diff coverage is 0.00%.

Impacted file tree graph

@@ Coverage Diff @@## main #1032 +/- ##
=======================================
Coverage 90.80% 90.81% =======================================
Files 60 60 Lines 31460 31459 -1 =======================================
+ Hits 28568 28570 +2 + Misses 2892 2889 -3
Impacted FilesCoverage Δ
lightning/src/util/ser_macros.rs96.31% <0.00%> (+0.39%)⬆️
lightning/src/ln/functional_tests.rs97.34% <0.00%> (+0.03%)⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update bee9a1e...b4c3a33. Read the comment docs.

@jkczyz
Fix #[warn(clippy::try_err)] in ser_macros.rs
58a4dc0
@jkczyz
Fail linter on #[warn(clippy::try_err)]
b4c3a33
Some heavily used macros are using ? directly on an Err. Using a return
is easier to read and removes hundreds of linter warnings.
https://rust-lang.github.io/rust-clippy/master/index.html#try_err
TheBlueMatt
TheBlueMatt approved these changes Aug 2, 2021
View reviewed changes

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

LGTM if clippy is happy.

@TheBlueMatt
TheBlueMatt merged commit 7dfa886 into lightningdevkit:mainAug 2, 2021
PXplod pushed a commit to bitlightlabs/rust-lightning that referenced this pull request Sep 30, 2024
@zoedberg
Merge tag 'v0.0.115' into 89b585b
6de8c4f
0.0.115 - Apr 24, 2023 - "Rebroadcast the Bugfixes"
API Updates
===========
* The MSRV of the main LDK crates has been increased to 1.48 (lightningdevkit#2107).
* Attempting to claim an un-expired payment on a channel which has closed no
longer fails. The expiry time of payments is exposed via
`PaymentClaimable::claim_deadline` (lightningdevkit#2148).
* `payment_metadata` is now supported in `Invoice` deserialization, sending,
and receiving (via a new `RecipientOnionFields` struct) (lightningdevkit#2139, lightningdevkit#2127).
* `Event::PaymentFailed` now exposes a failure reason (lightningdevkit#2142).
* BOLT12 messages now support stateless generation and validation (lightningdevkit#1989).
* The `NetworkGraph` is now pruned of stale data after RGS processing (lightningdevkit#2161).
* Max inbound HTLCs in-flight can be changed in the handshake config (lightningdevkit#2138).
* `lightning-transaction-sync` feature `esplora-async-https` was added (lightningdevkit#2085).
* A `ChannelPending` event is now emitted after the initial handshake (lightningdevkit#2098).
* `PaymentForwarded::outbound_amount_forwarded_msat` was added (lightningdevkit#2136).
* `ChannelManager::list_channels_by_counterparty` was added (lightningdevkit#2079).
* `ChannelDetails::feerate_sat_per_1000_weight` was added (lightningdevkit#2094).
* `Invoice::fallback_addresses` was added to fetch `bitcoin` types (lightningdevkit#2023).
* The offer/refund description is now exposed in `Invoice{,Request}` (lightningdevkit#2206).
Backwards Compatibility
=======================
* Payments sent with the legacy `*_with_route` methods on LDK 0.0.115+ will no
longer be retryable via the LDK 0.0.114- `retry_payment` method (lightningdevkit#2139).
* `Event::PaymentPathFailed::retry` was removed and will always be `None` for
payments initiated on 0.0.115 which fail on an earlier version (lightningdevkit#2063).
* `Route`s and `PaymentParameters` with blinded path information will not be
readable on prior versions of LDK. Such objects are not currently constructed
by LDK, but may be when processing BOLT12 data in a coming release (lightningdevkit#2146).
* Providing `ChannelMonitorUpdate`s generated by LDK 0.0.115 to a
`ChannelMonitor` on 0.0.114 or before may panic (lightningdevkit#2059). Note that this is
in general unsupported, and included here only for completeness.
Bug Fixes
=========
* Fixed a case where `process_events_async` may `poll` a `Future` which has
already completed (lightningdevkit#2081).
* Fixed deserialization of `u16` arrays. This bug may have previously corrupted
the historical buckets in a `ProbabilisticScorer`. Users relying on the
historical buckets may wish to wipe their scorer on upgrade to remove corrupt
data rather than waiting on it to decay (lightningdevkit#2191).
* The `process_events_async` task is now `Send` and can thus be polled on a
multi-threaded runtime (lightningdevkit#2199).
* Fixed a missing macro export causing
`impl_writeable_tlv_based_enum{,_upgradable}` calls to not compile (lightningdevkit#2091).
* Fixed compilation of `lightning-invoice` with both `no-std` and serde (lightningdevkit#2187)
* Fix an issue where the `background-processor` would not wake when a
`ChannelMonitorUpdate` completed asynchronously, causing delays (lightningdevkit#2090).
* Fix an issue where `process_events_async` would exit immediately (lightningdevkit#2145).
* `Router` calls from the `ChannelManager` now call `find_route_with_id` rather
than `find_route`, as was intended and described in the API (lightningdevkit#2092).
* Ensure `process_events_async` always exits if any sleep future returns true,
not just if all sleep futures repeatedly return true (lightningdevkit#2145).
* `channel_update` messages no longer set the disable bit unless the peer has
been disconnected for some time. This should resolve cases where channels are
disabled for extended periods of time (lightningdevkit#2198).
* We no longer remove CLN nodes from the network graph for violating the BOLT
spec in some cases after failing to pay through them (lightningdevkit#2220).
* Fixed a debug assertion which may panic under heavy load (lightningdevkit#2172).
* `CounterpartyForceClosed::peer_msg` is now wrapped in UntrustedString (lightningdevkit#2114)
* Fixed a potential deadlock in `funding_transaction_generated` (lightningdevkit#2158).
Security
========
* Transaction re-broadcasting is now substantially more aggressive, including a
new regular rebroadcast feature called on a timer from the
`background-processor` or from `ChainMonitor::rebroadcast_pending_claims`.
This should substantially increase transaction confirmation reliability
without relying on downstream `TransactionBroadcaster` implementations for
rebroadcasting (lightningdevkit#2203, lightningdevkit#2205, lightningdevkit#2208).
* Implemented the changes from BOLT PRs lightningdevkit#1031, lightningdevkit#1032, and lightningdevkit#1040 which resolve a
privacy vulnerability which allows an intermediate node on the path to
discover the final destination for a payment (lightningdevkit#2062).
In total, this release features 110 files changed, 11928 insertions, 6368
deletions in 215 commits from 21 authors, in alphabetical order:
* Advait
* Alan Cohen
* Alec Chen
* Allan Douglas R. de Oliveira
* Arik Sosman
* Elias Rohrer
* Evan Feenstra
* Jeffrey Czyz
* John Cantrell
* Lucas Soriano del Pino
* Marc Tyndel
* Matt Corallo
* Paul Miller
* Steven
* Steven Williamson
* Steven Zhao
* Tony Giorgio
* Valentine Wallace
* Wilmer Paulino
* benthecarman
* munjesi
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@TheBlueMattTheBlueMattTheBlueMatt approved these changes
@valentinewallacevalentinewallacevalentinewallace approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jkczyz@TheBlueMatt@valentinewallace