mirror of https://gitlab.torproject.org/tpo/core/arti http://git.dilluti0n.com/mirrors/arti.git/atom?h=arti-v1.2.3 2024-04-13T15:12:56Z 2024-04-13T15:12:56Z Richard Pospesel richard@torproject.org 2024-04-13T15:12:56Z urn:sha1:4e825604034dab8f565f3f8d6c0907fc62633f07 2024-04-03T12:34:16Z Ian Jackson iwj@torproject.org 2024-04-03T12:34:16Z urn:sha1:fbf3551fbf1fcffafaaf3d7a006bdf07661aac9c Switch to derive-deftly See merge request tpo/core/arti!2066 2024-04-03T12:15:08Z Ian Jackson ijackson@chiark.greenend.org.uk 2024-04-02T14:59:44Z urn:sha1:9fd94822a4dd2c267b0ebdca122bde8123d506d1 Found by "git grep adhoc" and manual inspection. 2024-04-03T12:15:08Z Ian Jackson ijackson@chiark.greenend.org.uk 2024-04-02T14:49:54Z urn:sha1:3f39cf7767dba7dff7686b565aee5ea810c4c6d6 2024-04-03T12:11:39Z Ian Jackson ijackson@chiark.greenend.org.uk 2024-04-02T11:58:49Z urn:sha1:b71d0bf6cd413650550b40ce81e02dc47ae2fa5e This is the combination of a number of separate commits, many of which were generated by seddery, and then rebased and squashed. Cargo.toml perl -i~ -pe 's{^derive-adhoc}{derive-deftly = "0.10"}' crates/*/Cargo.toml (not regenerated during rebase) update Cargo.lock `cargo fetch` without --locked (regenerated during rebase) seddery git-ls-files | grep '\.rs$' | xargs perl -i~ -pe 's{^use derive_adhoc}{use derive_deftly}' git-ls-files | grep '\.rs$' | xargs perl -i~ -pe 's{\bdefine_derive_adhoc\b}{define_derive_deftly}g' git-ls-files | grep '\.rs$' | xargs perl -i~ -pe 's{\bAdhoc\b}{Deftly}g if m{derive}' git-ls-files | grep '\.rs$' | xargs perl -i~ -pe 's{\#\[derive_adhoc\b}{#[derive_deftly}g' git-ls-files | grep '\.rs$' | xargs perl -i~ -pe 's{use derive_adhoc}{use derive_deftly}' git-ls-files | grep '\.rs$' | xargs perl -i~ -pe 's{\bderive_adhoc\b}{derive_deftly_adhoc} if m{use.*deftly}' git-ls-files | grep '\.rs$' | xargs perl -i~ -pe 's{\bderive_adhoc!}{derive_deftly_adhoc!}' (not regenerated during rebase) Manually add `#[derive_deftly_adhoc]` where needed. seddery git-ls-files | grep '\.rs$' | xargs perl -i~ -pe 's{\#\[adhoc\b}{#[deftly}g' git-ls-files | grep '\.rs$' | xargs perl -i~ -pe 's{\bderive_adhoc_template}{derive_deftly_template}' (not regenerated during rebase) Manually fix up an import Manually update some builder attrs Manually fix up tor_rtmock::time_core This was missed in my seddery, due to me rebasing the branch and not redoing the seddery. 2024-04-02T17:41:39Z Gabriela Moldovan gabi@torproject.org 2024-04-02T15:35:55Z urn:sha1:08b1b75bbb7e0051b0e429e97857b753a001fc69 Prompted by https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/2064#note_3014793 2024-04-02T14:58:38Z Gabriela Moldovan gabi@torproject.org 2024-04-02T14:58:38Z urn:sha1:21ba4d453e650c672e985d41931cefcc9a04c10a 2024-04-02T11:56:05Z Gabriela Moldovan gabi@torproject.org 2024-04-02T11:32:55Z urn:sha1:822afe162dce39f673068e887ea91d296601e417 2024-04-02T11:55:59Z Gabriela Moldovan gabi@torproject.org 2024-04-02T11:55:59Z urn:sha1:7040f26ff17831023a5c2380ab9d4d4f8d9e2107 2024-04-02T11:52:31Z Gabriela Moldovan gabi@torproject.org 2024-03-27T15:33:34Z urn:sha1:239ccf973f40b9f3144189a07906736d965e9d54 !2024 introduced `BackoffSchedule::single_attempt_timeout()`, partially implementing #1259. This completes the implementation by moving the per-iteration timeout from the publisher reactor to `backoff::Runner`. Addresses https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/2024?commit_id=a4f2bf5cb7d4027a49b74ec5a5298f7b9a3cf62e#note_3005097 Note: the `if should_retry` block is intentionally misindented, to make reviewing the actual changes easier. A future commit will fix the indentation. I originally wanted to suggest reviewing this commit using `--ignore-space-change`, but I found that it makes things a bit confusing (it shows some funky indentation around the parts that have both whitespace changes and modifications). Closes #1259