File tree Expand file tree Collapse file tree 1 file changed +13
-9
lines changed Expand file tree Collapse file tree 1 file changed +13
-9
lines changed Original file line number Diff line number Diff line change @@ -758,16 +758,20 @@ fn validate_zulip_stream_ids(data: &Data, errors: &mut Vec<String>) {
758758 return Ok ( ( ) ) ;
759759 }
760760
761- wrapper ( team. members ( data) ?. iter ( ) , errors, |member, _| {
762- if let Some ( member) = data. person ( member) {
763- if member. zulip_id ( ) . is_none ( ) {
764- bail ! (
765- "person `{}` in '{}' is a member of a Zulip stream but has no Zulip id" ,
766- member. github( ) ,
767- team. name( )
768- ) ;
761+ wrapper ( streams. iter ( ) , errors, |stream, errors| {
762+ wrapper ( stream. members ( ) . into_iter ( ) , errors, |member, _| {
763+ match member {
764+ ZulipMember :: MemberWithId { .. } | ZulipMember :: JustId ( _) => { }
765+ ZulipMember :: MemberWithoutId { github } => {
766+ bail ! (
767+ "person `{github}` is a member of a Zulip stream `{}` defined in team `{}`, but has no Zulip id" ,
768+ stream. name( ) ,
769+ team. name( )
770+ ) ;
771+ }
769772 }
770- }
773+ Ok ( ( ) )
774+ } ) ;
771775 Ok ( ( ) )
772776 } ) ;
773777 Ok ( ( ) )
You can’t perform that action at this time.
0 commit comments