Visitar URL original
Some more cleanups & fixes by parenthetical · Pull Request #557 · reflex-frp/reflex · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
09442be
Add occurrence clear queue hygiene under DEBUG_FRAME, fix coincidence…
parenthetical Oct 19, 2026
32f0775
Solve O(n^2) mergeInt behavior/store invalidated parent heights in He…
parenthetical Oct 19, 2026
f702663
Add .hlint.yaml same as CI
parenthetical Oct 19, 2026
2f63113
Factor out EventSubscribed construction into newEventSubscribed
parenthetical Oct 19, 2026
3dc9952
Delete ResultM/ComputeM aliases
parenthetical Oct 21, 2026
3b2a02e
Replace unEvent with subscribeAndRead
parenthetical Oct 21, 2026
73819b6
Drop dynamicHoldIdentity, dynamicDynIdentity and behaviorHoldIdentity
parenthetical Oct 21, 2026
c40a56e
Drop wrap and rename getRootSubscribed to subscribeAndReadRoot
parenthetical Oct 22, 2026
e0d786c
Prevent unsubscribed merges from subscribing to new parents
parenthetical Oct 23, 2026
d636d85
Fix race condition in unsubscribed switches
parenthetical Oct 23, 2026
8e56d03
Cleanup subscription code/delete unneeded runHoldInits
parenthetical Oct 26, 2026
c786b7b
Drop switchSubscribedOwnWeakInvalidator
parenthetical Oct 23, 2026
58f4e75
Register the fans benchmark group in saulzar-bench
parenthetical Oct 24, 2026
5974d21
Fan w/weak-reference based cleanup + fix race condition
parenthetical Oct 24, 2026
337b336
Insert and remove fan subscribers with one map traversal
parenthetical Oct 24, 2026
6831b55
Use atomicModifyIORef'_ for the fan key map
parenthetical Oct 24, 2026
85b69ca
Remove a height from a HeightBag with one IntMap traversal
parenthetical Oct 24, 2026
6f05ed4
Add a benchmark group for merges whose parents change in every frame
parenthetical Oct 24, 2026
7a1e327
Use mapInsertLookup and mapDeleteLookup in updateMergeParents
parenthetical Oct 24, 2026
a59352e
Fix finalizer-caused root key teardown race
parenthetical Oct 25, 2026
e7a1c3d
Cleanup unused functionality of WeakBag
parenthetical Oct 26, 2026
eb02051
Factor out readSwitchParent
parenthetical Oct 27, 2026
de3b05f
Factor out setOccurrence
parenthetical Oct 27, 2026
019bd2d
Make the subscriber constructors pure
parenthetical Oct 27, 2026
c38c003
Simplify getHoldEventSubscription
parenthetical Oct 27, 2026
d295a36
Replace the HasCurrentHeight class with functions in EventM
parenthetical Oct 27, 2026
a30f2f6
Factor out subscription and height helpers
parenthetical Oct 27, 2026
b43614c
Simplify behavior dependency tracking
parenthetical Oct 27, 2026
fb0c958
Store the Hold of a HoldDyn by reference
parenthetical Oct 28, 2026
15b339a
Build the InvalidatorList of a computed pull eagerly
parenthetical Oct 28, 2026
e87e827
Replace the BehaviorEnv tuple with a record
parenthetical Oct 27, 2026
f7741da
Drop the instances of SubscribeResult
parenthetical Oct 27, 2026
7899319
Drop the deprecated SpiderEnv type synonym
parenthetical Oct 27, 2026
b84a5a5
Drop whoCreatedEventSubscribed
parenthetical Oct 27, 2026
e741b41
Clean up Reflex.Spider.Internal
parenthetical Oct 27, 2026
227a5f8
Deduplicate switch some
parenthetical Oct 28, 2026
c5a26cc
Replace per-subscription EventSubscribed with one EventNode per node
parenthetical Oct 22, 2026
18a277d
Fix isUnmarkedInvalidHeight under DEBUG_CYCLES
parenthetical Oct 30, 2026
4b9263a
Some cleanup
parenthetical Oct 22, 2026
22c3fca
Inline initHold functions
parenthetical Oct 22, 2026
5c2b1af
Inline single use cacheSubscription function
parenthetical Nov 1, 2026
aa006d7
Delete unused function
parenthetical Nov 1, 2026
fb2d5a1
Fix lost occurrences in newEventWithLazyTriggerWithOnComplete
parenthetical Nov 7, 2026
cb483d0
Lint/Fix hlint
parenthetical Nov 8, 2026
8a1fe18
Move to haskell-ci, remove macOS runs, cleanup
parenthetical Nov 8, 2026
7f108df
Move CPP conditionals out of declarations
parenthetical Nov 8, 2026
7fa604b
git subrepo clone git@github.com:obsidiansystems/style.hs.git style.hs
parenthetical Nov 8, 2026
332db81
style.hs CI job
parenthetical Nov 8, 2026
7aef383
Format/fix style.hs hlint notes
parenthetical Nov 8, 2026
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
274 changes: 274 additions & 0 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,274 @@
# This GitHub workflow config has been generated by a script via
#
# haskell-ci 'github' 'cabal.project'
#
# To regenerate the script (for example after adjusting tested-with) run
#
# haskell-ci regenerate
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
# version: 0.19.20261010
#
# REGENDATA ("0.19.20261010",["github","cabal.project"])
#
name: Haskell-CI
on:
- push
- pull_request
- merge_group
- workflow_dispatch
jobs:
linux:
name: Haskell-CI - Linux - ${{ matrix.compiler }}
runs-on: ubuntu-24.04
timeout-minutes:
60
container:
image: buildpack-deps:noble
continue-on-error: ${{ matrix.allow-failure }}
strategy:
matrix:
include:
- compiler: ghc-9.14.1
compilerKind: ghc
compilerVersion: 9.14.1
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.12.4
compilerKind: ghc
compilerVersion: 9.12.4
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.10.3
compilerKind: ghc
compilerVersion: 9.10.3
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.8.4
compilerKind: ghc
compilerVersion: 9.8.4
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.6.7
compilerKind: ghc
compilerVersion: 9.6.7
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.4.8
compilerKind: ghc
compilerVersion: 9.4.8
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.2.8
compilerKind: ghc
compilerVersion: 9.2.8
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.0.2
compilerKind: ghc
compilerVersion: 9.0.2
setup-method: ghcup
allow-failure: false
- compiler: ghc-8.10.7
compilerKind: ghc
compilerVersion: 8.10.7
setup-method: ghcup
allow-failure: false
- compiler: ghc-8.8.4
compilerKind: ghc
compilerVersion: 8.8.4
setup-method: ghcup
allow-failure: false
- compiler: ghc-8.6.5
compilerKind: ghc
compilerVersion: 8.6.5
setup-method: ghcup
allow-failure: false
- compiler: ghc-8.4.4
compilerKind: ghc
compilerVersion: 8.4.4
setup-method: ghcup
allow-failure: false
fail-fast: false
steps:
- name: apt-get install
run: |
apt-get update
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libnuma-dev
- name: Install GHCup
run: |
mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
chmod a+x "$HOME/.ghcup/bin/ghcup"
- name: Install cabal-install
run: |
"$HOME/.ghcup/bin/ghcup" install cabal 3.16.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
echo "CABAL=$HOME/.ghcup/bin/cabal-3.16.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
- name: Install GHC (GHCup)
if: matrix.setup-method == 'ghcup'
run: |
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
echo "HC=$HC" >> "$GITHUB_ENV"
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
env:
HCKIND: ${{ matrix.compilerKind }}
HCNAME: ${{ matrix.compiler }}
HCVER: ${{ matrix.compilerVersion }}
- name: Set PATH and environment variables
run: |
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
env:
HCKIND: ${{ matrix.compilerKind }}
HCNAME: ${{ matrix.compiler }}
HCVER: ${{ matrix.compilerVersion }}
- name: env
run: |
env
- name: write cabal config
run: |
mkdir -p $CABAL_DIR
cat >> $CABAL_CONFIG <<EOF
remote-build-reporting: anonymous
write-ghc-environment-files: never
remote-repo-cache: $CABAL_DIR/packages
logs-dir: $CABAL_DIR/logs
world-file: $CABAL_DIR/world
extra-prog-path: $CABAL_DIR/bin
symlink-bindir: $CABAL_DIR/bin
installdir: $CABAL_DIR/bin
build-summary: $CABAL_DIR/logs/build.log
store-dir: $CABAL_DIR/store
install-dirs user
prefix: $CABAL_DIR
repository hackage.haskell.org
url: http://hackage.haskell.org/
EOF
cat >> $CABAL_CONFIG <<EOF
program-default-options
ghc-options: $GHCJOBS +RTS -M3G -RTS
EOF
cat $CABAL_CONFIG
- name: versions
run: |
$HC --version || true
$HC --print-project-git-commit-id || true
$CABAL --version || true
- name: update cabal index
run: |
$CABAL v2-update -v
- name: install cabal-plan
run: |
mkdir -p $HOME/.cabal/bin
curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.7.3.0/cabal-plan-0.7.3.0-x86_64-linux.xz > cabal-plan.xz
echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -
xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
rm -f cabal-plan.xz
chmod a+x $HOME/.cabal/bin/cabal-plan
cabal-plan --version
- name: checkout
uses: actions/checkout@v7
with:
path: source
- name: initial cabal.project for sdist
run: |
touch cabal.project
echo "packages: $GITHUB_WORKSPACE/source/." >> cabal.project
cat cabal.project
- name: sdist
run: |
mkdir -p sdist
$CABAL sdist all --output-dir $GITHUB_WORKSPACE/sdist
- name: unpack
run: |
mkdir -p unpacked
find sdist -maxdepth 1 -type f -name '*.tar.gz' -exec tar -C $GITHUB_WORKSPACE/unpacked -xzvf {} \;
- name: generate cabal.project
run: |
PKGDIR_reflex="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/reflex-[0-9.]*')"
echo "PKGDIR_reflex=${PKGDIR_reflex}" >> "$GITHUB_ENV"
rm -f cabal.project cabal.project.local
touch cabal.project
touch cabal.project.local
echo "packages: ${PKGDIR_reflex}" >> cabal.project
echo "package reflex" >> cabal.project
echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package reflex" >> cabal.project ; fi
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package reflex" >> cabal.project ; fi
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
cat >> cabal.project <<EOF
allow-newer: patch:base
EOF
cat cabal.project
cat cabal.project.local
- name: dump install plan
run: |
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
cabal-plan
- name: restore cache
uses: actions/cache/restore@v6
with:
key: noble-${{ matrix.compiler }}-${{ github.sha }}
path: ~/.cabal/store
restore-keys: noble-${{ matrix.compiler }}-
- name: install dependencies
run: |
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dependencies-only -j2 all
- name: build w/o tests
run: |
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
- name: build
run: |
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always
- name: tests
run: |
$CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct
- name: cabal check
run: |
cd ${PKGDIR_reflex} || false
${CABAL} -vnormal check
- name: haddock
run: |
$CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
- name: prepare for constraint sets
run: |
rm -f cabal.project.local
- name: constraint set debug-cycles
run: |
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='reflex +debug-cycles' all --dry-run
cabal-plan topo | sort
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='reflex +debug-cycles' --dependencies-only -j2 all
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='reflex +debug-cycles' all
- name: constraint set debug-propagation
run: |
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='reflex +debug-propagation' all --dry-run
cabal-plan topo | sort
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='reflex +debug-propagation' --dependencies-only -j2 all
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='reflex +debug-propagation' all
- name: constraint set old-these
run: |
if [ $((HCNUMVER < 80800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='these <1' all --dry-run ; fi
if [ $((HCNUMVER < 80800)) -ne 0 ] ; then cabal-plan topo | sort ; fi
if [ $((HCNUMVER < 80800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='these <1' --dependencies-only -j2 all ; fi
if [ $((HCNUMVER < 80800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='these <1' all ; fi
- name: save cache
if: always()
uses: actions/cache/save@v6
with:
key: noble-${{ matrix.compiler }}-${{ github.sha }}
path: ~/.cabal/store
85 changes: 0 additions & 85 deletions .github/workflows/haskell.yml

This file was deleted.

31 changes: 31 additions & 0 deletions .github/workflows/style.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Style
on:
- push
- pull_request
jobs:
style:
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v7
- name: Check that style.hs/ equals its upstream commit
run: |
commit=$(git config -f style.hs/.gitrepo subrepo.commit)
git fetch --depth 1 https://github.com/obsidiansystems/style.hs "$commit"
git diff --exit-code FETCH_HEAD HEAD:style.hs -- ':(exclude).gitrepo'
- uses: cachix/install-nix-action@v31
with:
github_access_token: ${{ secrets.GITHUB_TOKEN }}
extra_nix_config: |
extra-substituters = https://nixcache.reflex-frp.org
extra-trusted-public-keys = ryantrinkle.com-1:JJiAKaRv9mWgpVAz8dwewnZe0AzzEAzPkagE9SP5NWI=
- name: Check formatting
run: git ls-files -z '*.hs' | xargs -0 nix run ./style.hs -- --mode check
Comment thread
ymeister marked this conversation as resolved.
Resolved
hlint:
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v7
- uses: cachix/install-nix-action@v31
with:
github_access_token: ${{ secrets.GITHUB_TOKEN }}
- name: Run HLint
run: nix run ./style.hs#hlint -- --hint .hlint.yaml .
Loading