Commit 25982f8
committed
bug #1147 [Platform] Promote metadata from unwrapped into deferred result after merge (chr-hertel)
This PR was merged into the main branch.
Discussion
----------
[Platform] Promote metadata from unwrapped into deferred result after merge
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| Docs? | no
| Issues |
| License | MIT
Was quite confusing that metadata on `DeferredResult` does not contain the metadata that gets created on converted result.
Now the logic is:
* `DeferredResult` can have `Metadata`
* Converted `ResultInterface` can have `Metadata`
* `Metadata` gets merged after conversionin `ResultInterface` => `Metadata` of `DeferredResult` wins
* At the end merged `Metadata` gets promoted from `ResultInterface` instance back to `DeferredResult`
* Two separated instances of `Metadata` though.
Commits
-------
481a2f0 Promote metadata from unwrapped into deferred result after mergeFile tree
2 files changed
+17
-2
lines changed- src/platform
- src/Result
- tests/Result
2 files changed
+17
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
53 | | - | |
| 53 | + | |
| 54 | + | |
54 | 55 | | |
55 | 56 | | |
56 | 57 | | |
57 | | - | |
| 58 | + | |
58 | 59 | | |
59 | 60 | | |
60 | 61 | | |
| 62 | + | |
| 63 | + | |
61 | 64 | | |
62 | 65 | | |
63 | 66 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
136 | 136 | | |
137 | 137 | | |
138 | 138 | | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
139 | 151 | | |
140 | 152 | | |
141 | 153 | | |
| |||
0 commit comments