OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix iterableUnion types

pull/21833/head
Travis Ralston 2020-10-01 10:01:13 -06:00
parent 2ec94e8a69
commit 0570deffa2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/stores/widgets/StopGapWidgetDriver.ts
View File

@ -25,6 +25,6 @@ export class StopGapWidgetDriver extends WidgetDriver {
}
public async validateCapabilities(requested: Set<Capability>): Promise<Set<Capability>> {
return iterableUnion(requested, new Set(this.allowedCapabilities));
return new Set(iterableUnion(requested, this.allowedCapabilities));
}
}

4
src/utils/iterables.ts
View File

@ -16,6 +16,6 @@
import { arrayUnion } from "./arrays";
export function iterableUnion<C extends Iterable<T>, T>(a: C, b: C): Set<T> {
return new Set(arrayUnion(Array.from(a), Array.from(b)));
export function iterableUnion<T>(a: Iterable<T>, b: Iterable<T>): Iterable<T> {
return arrayUnion(Array.from(a), Array.from(b));
}