chiark / gitweb /
otter.git
3 years agoshapelib: Promote toplevel as table access
Ian Jackson [Wed, 4 May 2022 19:47:12 +0000 (20:47 +0100)]
shapelib: Promote toplevel as table access

We're going to want to get more out of this.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoSwitch to deriving Deref
Ian Jackson [Wed, 4 May 2022 20:56:19 +0000 (21:56 +0100)]
Switch to deriving Deref

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoSwitch to deriving Deref
Ian Jackson [Wed, 4 May 2022 20:55:34 +0000 (21:55 +0100)]
Switch to deriving Deref

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoSwitch to deriving Deref
Ian Jackson [Wed, 4 May 2022 20:54:02 +0000 (21:54 +0100)]
Switch to deriving Deref

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoSwitch to deriving Deref
Ian Jackson [Wed, 4 May 2022 20:50:51 +0000 (21:50 +0100)]
Switch to deriving Deref

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoSwitch to deriving Deref
Ian Jackson [Wed, 4 May 2022 20:50:19 +0000 (21:50 +0100)]
Switch to deriving Deref

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoSwitch to deriving Deref
Ian Jackson [Wed, 4 May 2022 20:50:15 +0000 (21:50 +0100)]
Switch to deriving Deref

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoSwitch to deriving Deref
Ian Jackson [Wed, 4 May 2022 20:47:18 +0000 (21:47 +0100)]
Switch to deriving Deref

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoSwitch to deriving Deref
Ian Jackson [Wed, 4 May 2022 20:42:13 +0000 (21:42 +0100)]
Switch to deriving Deref

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoSwitch to deriving Deref
Ian Jackson [Wed, 4 May 2022 20:40:19 +0000 (21:40 +0100)]
Switch to deriving Deref

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoFix doc comment order
Ian Jackson [Wed, 4 May 2022 20:41:52 +0000 (21:41 +0100)]
Fix doc comment order

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoshapelib: Rename Catalogue from Contents
Ian Jackson [Wed, 4 May 2022 19:43:24 +0000 (20:43 +0100)]
shapelib: Rename Catalogue from Contents

The old name was vague and confusing.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agosize handling: Centralise into Contents::load_image
Ian Jackson [Wed, 4 May 2022 19:03:47 +0000 (20:03 +0100)]
size handling: Centralise into Contents::load_image

This was duplicated code.  Now there is only one place that calls
OutlineTrait.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agosize handling: Make OutlineOccultable return type Copy
Ian Jackson [Wed, 4 May 2022 19:08:52 +0000 (20:08 +0100)]
size handling: Make OutlineOccultable return type Copy

It is.  Declare it, so we can reuse it nicely.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoshapelib: Rename ImageLoaded
Ian Jackson [Wed, 4 May 2022 18:57:26 +0000 (19:57 +0100)]
shapelib: Rename ImageLoaded

From OccInertLoaded.  We are going to make this the return time from
load_image (previously, load_svg).

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agosize handling: Rename OutlineCalculable::err_mapper
Ian Jackson [Wed, 4 May 2022 18:53:44 +0000 (19:53 +0100)]
size handling: Rename OutlineCalculable::err_mapper

I think this is a less confusing name.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoshapelib: Tidy a tiny bit of formatting
Ian Jackson [Wed, 4 May 2022 18:52:38 +0000 (19:52 +0100)]
shapelib: Tidy a tiny bit of formatting

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agosize handling: Sort out outline trait error handling
Ian Jackson [Wed, 4 May 2022 18:51:14 +0000 (19:51 +0100)]
size handling: Sort out outline trait error handling

Instead of the `ought` function which can be applied anywhere, use the
OutlineCalculable proof token to map the error at the trait call site.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agosize handling: Drop From<Outline> for OutlineCalculable
Ian Jackson [Wed, 4 May 2022 18:37:03 +0000 (19:37 +0100)]
size handling: Drop From<Outline> for OutlineCalculable

We don't want this, because (in the new code structure) it could only
exist if we somehow loaded an SVG, calculated its outline, threw the
outline away, and then wanted to recalculate it.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agosize handling: Plumb svg size through to OutlineDefn
Ian Jackson [Tue, 3 May 2022 00:29:27 +0000 (01:29 +0100)]
size handling: Plumb svg size through to OutlineDefn

3 years agosize handling: Postpone outline & xform calculations until svg load
Ian Jackson [Tue, 3 May 2022 19:15:49 +0000 (20:15 +0100)]
size handling: Postpone outline & xform calculations until svg load

We move the outline and xform out of the catalogue, which instead gets
a proof token showing that we did check the outline definition.

This will allow them to depend on the size read from the svg.

3 years agosize handling: Introduce OccInertLoaded
Ian Jackson [Tue, 3 May 2022 19:59:29 +0000 (20:59 +0100)]
size handling: Introduce OccInertLoaded

This is going to contain size information.

No functional change yet.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoutils: svg_parse_size: Take &HtmlStr, not &str
Ian Jackson [Wed, 4 May 2022 18:25:53 +0000 (19:25 +0100)]
utils: svg_parse_size: Take &HtmlStr, not &str

This is more correct.  And it will be more convenient shortly.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoRemove some Arcs
Ian Jackson [Tue, 3 May 2022 20:04:53 +0000 (21:04 +0100)]
Remove some Arcs

The one around Html is getting in my way.  These are an optimisation
which is only effective until the first save/load, which seems
useless.

Putting a GoodItemName in an Arc seems overkill.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoProvide todo function
Ian Jackson [Tue, 3 May 2022 19:10:45 +0000 (20:10 +0100)]
Provide todo function

Using the todo!() macro in fehler-annotated functions generates
annoying dead code warnings.

And, this will fail to build in release mode - yay!

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agosvg size handling: Obtain transform a bit earlier
Ian Jackson [Mon, 2 May 2022 11:27:59 +0000 (12:27 +0100)]
svg size handling: Obtain transform a bit earlier

It will be convnient to have access to svg_data.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agosvg size handling: Replace bundles.rs version
Ian Jackson [Mon, 2 May 2022 11:22:56 +0000 (12:22 +0100)]
svg size handling: Replace bundles.rs version

All the good properties of bundles.rs's version are now in the
utils.rs version.  Just call it.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agosvg size handling: Make the size mandatory
Ian Jackson [Mon, 2 May 2022 10:56:29 +0000 (11:56 +0100)]
svg size handling: Make the size mandatory

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agosvg size handling: Introduce SVGWidthOrHeight
Ian Jackson [Mon, 2 May 2022 10:58:36 +0000 (11:58 +0100)]
svg size handling: Introduce SVGWidthOrHeight

This allows us to return errors without cloning.  It also means we
will be able to sensibly report missing attributes when we make the
size mandatory.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agosvg size handling: SVG is case sensitive
Ian Jackson [Mon, 2 May 2022 10:44:56 +0000 (11:44 +0100)]
svg size handling: SVG is case sensitive

bundles.rs had this right.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agosvg size handling: Insist on having the SVG element first
Ian Jackson [Mon, 2 May 2022 10:42:36 +0000 (11:42 +0100)]
svg size handling: Insist on having the SVG element first

And restructure the parsing to look like that in bundles.rs.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agosvg size handling: Insist on having an SVG element
Ian Jackson [Mon, 2 May 2022 10:39:44 +0000 (11:39 +0100)]
svg size handling: Insist on having an SVG element

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agosvg size handling: Break out tokens as mut iterator
Ian Jackson [Mon, 2 May 2022 10:35:46 +0000 (11:35 +0100)]
svg size handling: Break out tokens as mut iterator

We're going to restructure this to be a bit more like the structure in
bundles.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agosvg size handling: Rename and move svg_parse_size
Ian Jackson [Mon, 2 May 2022 10:31:43 +0000 (11:31 +0100)]
svg size handling: Rename and move svg_parse_size

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoutils: Drop EmptyType
Ian Jackson [Mon, 2 May 2022 10:26:23 +0000 (11:26 +0100)]
utils: Drop EmptyType

It turns out that there already weren't any use sites.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoutils: Drop some unused bits
Ian Jackson [Mon, 2 May 2022 10:25:18 +0000 (11:25 +0100)]
utils: Drop some unused bits

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoutils: Tidy up and move DigestRead and DigestWrite
Ian Jackson [Mon, 2 May 2022 10:24:13 +0000 (11:24 +0100)]
utils: Tidy up and move DigestRead and DigestWrite

Now this file is more navigable.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agosvg size handling: Introduce new size parser
Ian Jackson [Mon, 2 May 2022 09:56:57 +0000 (10:56 +0100)]
svg size handling: Introduce new size parser

We want to get the size out of the svg on load, to make the library
spec size attribute optional (and to make things less confusing).
So start by add code to parse size out of an SVG.

But in fact it turns out we have one of these in bundle processing
already.  The need to be combined.  But for now, commit what we have.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoFix an error message typo
Ian Jackson [Mon, 2 May 2022 08:53:45 +0000 (09:53 +0100)]
Fix an error message typo

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agousvg-processor: Be a bit more verbose in error messages
Ian Jackson [Mon, 2 May 2022 08:51:27 +0000 (09:51 +0100)]
usvg-processor: Be a bit more verbose in error messages

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agocurrency: Example
Ian Jackson [Sun, 1 May 2022 21:45:33 +0000 (22:45 +0100)]
currency: Example

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agocurrency: Document
Ian Jackson [Sun, 1 May 2022 21:42:26 +0000 (22:42 +0100)]
currency: Document

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agodice: Document
Ian Jackson [Sun, 1 May 2022 21:22:19 +0000 (22:22 +0100)]
dice: Document

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoat-currency: Test merging properly
Ian Jackson [Sun, 1 May 2022 20:15:11 +0000 (21:15 +0100)]
at-currency: Test merging properly

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: updates: handle Delete
Ian Jackson [Sun, 1 May 2022 20:13:04 +0000 (21:13 +0100)]
apitest: updates: handle Delete

We blank out the info in the slot.  That's probably the best we can do
with the current data model.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoat-currency: Rename variables
Ian Jackson [Sun, 1 May 2022 20:08:58 +0000 (21:08 +0100)]
at-currency: Rename variables

This was getting quite confusing.  I think this scheme is less so.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoat-currency: More test
Ian Jackson [Sun, 1 May 2022 20:03:27 +0000 (21:03 +0100)]
at-currency: More test

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: updates: Recorded: Do not overwrite with nulls
Ian Jackson [Sun, 1 May 2022 20:02:41 +0000 (21:02 +0100)]
apitest: updates: Recorded: Do not overwrite with nulls

Some of these fields are Option, and if None, should nto overwrite
existing data.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoat-currency: Add spaces in desc patterns
Ian Jackson [Sun, 1 May 2022 19:49:35 +0000 (20:49 +0100)]
at-currency: Add spaces in desc patterns

We don't want to match numbers which happen to end with our pattern!

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoat-currency: Break out PieceInfo::assert_desc_contains
Ian Jackson [Sun, 1 May 2022 19:48:26 +0000 (20:48 +0100)]
at-currency: Break out PieceInfo::assert_desc_contains

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoat-currency: rename bn to bn1
Ian Jackson [Sun, 1 May 2022 19:36:30 +0000 (20:36 +0100)]
at-currency: rename bn to bn1

These are being taken in sequence.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoReplace make_svg_defs with render
Ian Jackson [Sun, 1 May 2022 19:30:23 +0000 (20:30 +0100)]
Replace make_svg_defs with render

This now demonstrates that there aren't any more svg generation sites
that forget to propagate a possibly-changed desc.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoat-currency: Check that descriptions (ie, qts) change
Ian Jackson [Sun, 1 May 2022 18:54:09 +0000 (19:54 +0100)]
at-currency: Check that descriptions (ie, qts) change

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoProperly update desc in Recorded updates
Ian Jackson [Sun, 1 May 2022 18:47:55 +0000 (19:47 +0100)]
Properly update desc in Recorded updates

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoat-currency: Use find_by_desc_glob
Ian Jackson [Sun, 1 May 2022 18:44:10 +0000 (19:44 +0100)]
at-currency: Use find_by_desc_glob

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoat-currency: Use currency symbol to find in desc
Ian Jackson [Sun, 1 May 2022 18:34:46 +0000 (19:34 +0100)]
at-currency: Use currency symbol to find in desc

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoscript: Demonstrate that we can use the desc in a log message
Ian Jackson [Sun, 1 May 2022 18:28:28 +0000 (19:28 +0100)]
script: Demonstrate that we can use the desc in a log message

We can now improve many more messages, but I have other fish to fry ATM.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoCorrect sense of pin/unpin log message
Ian Jackson [Sun, 1 May 2022 18:23:00 +0000 (19:23 +0100)]
Correct sense of pin/unpin log message

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoProvide desc even in piece updates, and note in script.ts
Ian Jackson [Sun, 1 May 2022 18:17:38 +0000 (19:17 +0100)]
Provide desc even in piece updates, and note in script.ts

This has always been provided, properly occulted, during session load,
but not provided in updates.  And all this time I have been writing
JS-generated log messages under the assumption that the JS can't
describe pieces.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoat-currency: Use synchu to synchronise, to update a_pieces
Ian Jackson [Sun, 1 May 2022 18:00:47 +0000 (19:00 +0100)]
at-currency: Use synchu to synchronise, to update a_pieces

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: updates: implement MoveQuiet
Ian Jackson [Sun, 1 May 2022 18:08:49 +0000 (19:08 +0100)]
apitest: updates: implement MoveQuiet

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: updates: implement Insert
Ian Jackson [Sun, 1 May 2022 18:08:29 +0000 (19:08 +0100)]
apitest: updates: implement Insert

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: updates: move p unwraps
Ian Jackson [Sun, 1 May 2022 18:08:10 +0000 (19:08 +0100)]
apitest: updates: move p unwraps

So that we can do Insert

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: updates: drop a dbg and the parameter it uses
Ian Jackson [Sun, 1 May 2022 18:02:24 +0000 (19:02 +0100)]
apitest: updates: drop a dbg and the parameter it uses

I'm not sure why nick is passed here.  Whatever.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: updates: reorder generics to match argument order
Ian Jackson [Sun, 1 May 2022 18:01:07 +0000 (19:01 +0100)]
apitest: updates: reorder generics to match argument order

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: updates: panic on unknown updates
Ian Jackson [Sun, 1 May 2022 17:51:07 +0000 (18:51 +0100)]
apitest: updates: panic on unknown updates

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: updates: explicitly ignore Log
Ian Jackson [Sun, 1 May 2022 17:49:55 +0000 (18:49 +0100)]
apitest: updates: explicitly ignore Log

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: updates: explicitly ignore various other updates
Ian Jackson [Sun, 1 May 2022 17:49:20 +0000 (18:49 +0100)]
apitest: updates: explicitly ignore various other updates

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: updates: explicitly ignore SetTable*
Ian Jackson [Sun, 1 May 2022 17:48:08 +0000 (18:48 +0100)]
apitest: updates: explicitly ignore SetTable*

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: updates: handle RecordedUnpredictable
Ian Jackson [Sun, 1 May 2022 17:47:23 +0000 (18:47 +0100)]
apitest: updates: handle RecordedUnpredictable

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: updates: explicitly ignore MoveHist*
Ian Jackson [Sun, 1 May 2022 17:46:08 +0000 (18:46 +0100)]
apitest: updates: explicitly ignore MoveHist*

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: updates: handle Image
Ian Jackson [Sun, 1 May 2022 17:45:25 +0000 (18:45 +0100)]
apitest: updates: handle Image

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: Introduce and use JsV extension extend
Ian Jackson [Sun, 1 May 2022 17:43:45 +0000 (18:43 +0100)]
apitest: Introduce and use JsV extension extend

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: updates: Always call findp
Ian Jackson [Sun, 1 May 2022 17:33:16 +0000 (18:33 +0100)]
apitest: updates: Always call findp

This makes the code smaller.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: updates: Refactor findp again
Ian Jackson [Sun, 1 May 2022 17:32:24 +0000 (18:32 +0100)]
apitest: updates: Refactor findp again

I keep shilly-shallying.  I think I want this to be called all the time.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: Add a comment about what PieceInfo<JsV> means
Ian Jackson [Sun, 1 May 2022 17:23:41 +0000 (18:23 +0100)]
apitest: Add a comment about what PieceInfo<JsV> means

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: updatess: Implement Recorded
Ian Jackson [Sun, 1 May 2022 17:22:13 +0000 (18:22 +0100)]
apitest: updatess: Implement Recorded

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: updatess: Expect to find the pieces we are updating
Ian Jackson [Sun, 1 May 2022 17:21:55 +0000 (18:21 +0100)]
apitest: updatess: Expect to find the pieces we are updating

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: Break out findp
Ian Jackson [Sun, 1 May 2022 17:21:04 +0000 (18:21 +0100)]
apitest: Break out findp

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: Introduce and use JsV extension set
Ian Jackson [Sun, 1 May 2022 17:20:02 +0000 (18:20 +0100)]
apitest: Introduce and use JsV extension set

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: fold lines longer
Ian Jackson [Sun, 1 May 2022 16:03:24 +0000 (17:03 +0100)]
apitest: fold lines longer

Mostly they don't fold now.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: Refactor to make room for handling more piece ops
Ian Jackson [Sun, 1 May 2022 16:03:11 +0000 (17:03 +0100)]
apitest: Refactor to make room for handling more piece ops

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoapitest: Add a bit of logging
Ian Jackson [Sun, 1 May 2022 16:02:58 +0000 (17:02 +0100)]
apitest: Add a bit of logging

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoat-currency: wip
Ian Jackson [Sun, 1 May 2022 14:39:48 +0000 (15:39 +0100)]
at-currency: wip

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agocurrency: Fix the log message
Ian Jackson [Sun, 1 May 2022 13:46:28 +0000 (14:46 +0100)]
currency: Fix the log message

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agofastsplit_delete: Implement, and use in currency
Ian Jackson [Sun, 1 May 2022 13:43:04 +0000 (14:43 +0100)]
fastsplit_delete: Implement, and use in currency

Amazingly, this seems to work at least in my basic ad-hoc test.
The log message needs a little work.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoheld_change_hook: Pass some more arguments
Ian Jackson [Sun, 1 May 2022 13:39:09 +0000 (14:39 +0100)]
held_change_hook: Pass some more arguments

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoToReculculate: Slightly improve docs and formatting of with
Ian Jackson [Sun, 1 May 2022 12:02:31 +0000 (13:02 +0100)]
ToReculculate: Slightly improve docs and formatting of with

This was a bit confusing at first.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoToRecalculate: Refactor implement methods
Ian Jackson [Sun, 1 May 2022 11:59:01 +0000 (12:59 +0100)]
ToRecalculate: Refactor implement methods

These are more convenient now, and the authorisation trickery is
now where we can more clearly justify it.

Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agodelete_piece: Plumb PieceUpdateOp, and document re log
Ian Jackson [Sun, 1 May 2022 11:39:26 +0000 (12:39 +0100)]
delete_piece: Plumb PieceUpdateOp, and document re log

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agodelete_piece: Break out into global.rs
Ian Jackson [Sun, 1 May 2022 11:19:35 +0000 (12:19 +0100)]
delete_piece: Break out into global.rs

fastsplit deletion is going to want this.  This may not be in its
final form, particularly because of ToRecalculate, which fastsplit
doesn't have one of yet.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agorename GOccults from GameOccults
Ian Jackson [Sun, 1 May 2022 11:14:12 +0000 (12:14 +0100)]
rename GOccults from GameOccults

Tried to refer to it as GOccults (without looking it up) and obviously
that's what it ought to be.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoRemove a pointless function
Ian Jackson [Sun, 1 May 2022 10:36:44 +0000 (11:36 +0100)]
Remove a pointless function

This seems to just recurse to itself.  Deleting it leaves everything
still compiling.  How odd.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoChange many .drain(..) into into_iter()
Ian Jackson [Sun, 1 May 2022 10:35:33 +0000 (11:35 +0100)]
Change many .drain(..) into into_iter()

In Rust 2021 this is more convenient to write.  We retain one.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoMiscellaneous cleanups prompted by clippy
Ian Jackson [Sun, 1 May 2022 10:34:58 +0000 (11:34 +0100)]
Miscellaneous cleanups prompted by clippy

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoOpOutcomeThunk: replace the other open-coded resolution site
Ian Jackson [Sun, 1 May 2022 10:15:44 +0000 (11:15 +0100)]
OpOutcomeThunk: replace the other open-coded resolution site

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoOpOutcomeThunk: change resolve to be method on thunk
Ian Jackson [Sun, 1 May 2022 10:13:36 +0000 (11:13 +0100)]
OpOutcomeThunk: change resolve to be method on thunk

The other call site (which will come in a moment) doesn't have a
Result.  And this was a bit too cooked anyway.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoIntroduce OpOutcomeThunkGeneric resolve on Result
Ian Jackson [Sun, 1 May 2022 10:08:59 +0000 (11:08 +0100)]
Introduce OpOutcomeThunkGeneric resolve on Result

On the way to getting rid of the other ad-hoc resolution site.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoGenericise OpOutcomeThunk
Ian Jackson [Sun, 1 May 2022 10:03:10 +0000 (11:03 +0100)]
Genericise OpOutcomeThunk

So that we can centralise resolution.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoOpOutcomeThunk: Fix typo in comment
Ian Jackson [Sun, 1 May 2022 09:53:26 +0000 (10:53 +0100)]
OpOutcomeThunk: Fix typo in comment

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>