Commit 5ac68a0
authored
Key expected's SMF constraints/noexcept on E, not the exposition-only unexpected<E> (#69)
## Summary
`expected<T,E>` stores its error as the exposition-only `unexpected<E>`
(D4280) so the reference specializations can share one member type
(`unexpected<E&>` holds a pointer). This PR makes sure that's genuinely
observable-only, ABI-preserving scaffolding:
- Re-keys every special-member
*Constraints*/*Mandates*/`noexcept`/triviality condition in
`expected.hpp` (all three specializations) from `unexpected<E>` to `E`,
and does the same in the just-landed wording (`expected-new.tex`). An
implementation that stores `E` directly stays trivially conforming — no
ABI, layout, or mangling change is forced on anyone.
- Fixes two divergences from `std::expected` a beman-vs-`std`
trait-equivalence harness (added here) turned up:
- the hidden-friend `swap` was unconstrained, so
`is_swappable_v<expected<T,E>>` was a hard compile error (not a
well-formed `false`) for a move-restricted `E`
- the non-trivial copy constructor/assignment were missing their
conditional `noexcept`
- Declares the trivial-path copy/move constructor unconditionally (no
`requires`-clause), matching libstdc++'s own `<expected>` idiom, after
the equivalence harness caught GCC and Clang disagreeing on
`is_trivially_copyable_v<expected<int, Immovable>>` for a
fully-immovable error type. The same trick was tried for assignment and
reverted — it silently broke the "move assignment must be deleted when
neither side is nothrow-movable" safety guarantee — so assignment
operators keep their original two-candidate form; this is documented in
the paper rather than forced.
- Documents both decisions in `D4280R0.tex` (D12: exposition-only
member, ABI stability as a design goal, resolution toward the T/E
rendering if any divergence is ever found; D13: `expected<T,E>` is
trivially copyable when `T`,`E` are, called out as a drive-by fix over
`std::expected`'s non-trivial-by-specification-accident assignment).
## Test plan
- [x] Full suite (1081 tests, including the `std::expected` parity gate
and the new equivalence gate) passes on GCC/libstdc++
- [x] Full suite passes on Clang/libstdc++
- [x] `pre-commit` (clang-format, gersemi, codespell, beman-tidy) clean
on all changed files6 files changed
Lines changed: 524 additions & 178 deletions
File tree
- include/beman/expected
- papers
- tests/beman/expected
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
614 | 614 | | |
615 | 615 | | |
616 | 616 | | |
| 617 | + | |
| 618 | + | |
| 619 | + | |
| 620 | + | |
| 621 | + | |
| 622 | + | |
| 623 | + | |
| 624 | + | |
| 625 | + | |
| 626 | + | |
| 627 | + | |
| 628 | + | |
| 629 | + | |
| 630 | + | |
| 631 | + | |
| 632 | + | |
| 633 | + | |
| 634 | + | |
| 635 | + | |
| 636 | + | |
| 637 | + | |
| 638 | + | |
| 639 | + | |
| 640 | + | |
| 641 | + | |
| 642 | + | |
| 643 | + | |
| 644 | + | |
| 645 | + | |
| 646 | + | |
| 647 | + | |
| 648 | + | |
| 649 | + | |
| 650 | + | |
| 651 | + | |
| 652 | + | |
| 653 | + | |
| 654 | + | |
| 655 | + | |
| 656 | + | |
| 657 | + | |
| 658 | + | |
| 659 | + | |
| 660 | + | |
| 661 | + | |
| 662 | + | |
| 663 | + | |
| 664 | + | |
| 665 | + | |
| 666 | + | |
| 667 | + | |
| 668 | + | |
| 669 | + | |
| 670 | + | |
| 671 | + | |
| 672 | + | |
| 673 | + | |
| 674 | + | |
| 675 | + | |
| 676 | + | |
| 677 | + | |
| 678 | + | |
| 679 | + | |
| 680 | + | |
| 681 | + | |
| 682 | + | |
617 | 683 | | |
618 | 684 | | |
619 | 685 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1393 | 1393 | | |
1394 | 1394 | | |
1395 | 1395 | | |
1396 | | - | |
| 1396 | + | |
1397 | 1397 | | |
1398 | 1398 | | |
1399 | 1399 | | |
| |||
2479 | 2479 | | |
2480 | 2480 | | |
2481 | 2481 | | |
2482 | | - | |
| 2482 | + | |
2483 | 2483 | | |
2484 | 2484 | | |
2485 | 2485 | | |
| |||
3062 | 3062 | | |
3063 | 3063 | | |
3064 | 3064 | | |
3065 | | - | |
| 3065 | + | |
3066 | 3066 | | |
3067 | | - | |
3068 | | - | |
| 3067 | + | |
| 3068 | + | |
3069 | 3069 | | |
3070 | 3070 | | |
3071 | 3071 | | |
| |||
3205 | 3205 | | |
3206 | 3206 | | |
3207 | 3207 | | |
3208 | | - | |
| 3208 | + | |
3209 | 3209 | | |
3210 | 3210 | | |
3211 | 3211 | | |
| |||
3340 | 3340 | | |
3341 | 3341 | | |
3342 | 3342 | | |
3343 | | - | |
| 3343 | + | |
3344 | 3344 | | |
3345 | 3345 | | |
3346 | 3346 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
| 42 | + | |
42 | 43 | | |
43 | 44 | | |
44 | 45 | | |
| |||
97 | 98 | | |
98 | 99 | | |
99 | 100 | | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
100 | 126 | | |
101 | 127 | | |
102 | 128 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
0 commit comments