Don't stop adding sections on the first error.

The "error" might be returned when a section is attempted to be added
and the user specified other sections instead.

Author: iddm

examples/info_handler_builder.rs

@@ -11,7 +11,7 @@ fn add_info(ctx: &InfoContext, _for_crash_report: bool) -> RedisResult<()> {
         .field("key", "value")?
         .build_dictionary()?
         .build_section()?
-        .build_info();
+        .build_info()?;
 
     Ok(())
 }

examples/info_handler_multiple_sections.rs

@@ -1,5 +1,3 @@
-use std::collections::HashMap;
-
 use redis_module::InfoContext;
 use redis_module::{redis_module, RedisResult};
 use redis_module_macros::{info_command_handler, InfoSection};
@@ -19,7 +17,7 @@ fn add_info(ctx: &InfoContext, _for_crash_report: bool) -> RedisResult<()> {
     let data = InfoSection1 {
         field_1: "value1".to_owned(),
     };
-    let _ = ctx.build_one_section(data);
+    let _ = ctx.build_one_section(data)?;
 
     let data = InfoSection2 {
         field_2: "value2".to_owned(),

examples/test_helper.rs

@@ -1,5 +1,3 @@
-use std::collections::HashMap;
-
 use redis_module::{redis_module, Context, RedisError, RedisResult, RedisString};
 use redis_module::{InfoContext, Status};
 
@@ -32,12 +30,10 @@ fn test_helper_err(ctx: &Context, args: Vec<RedisString>) -> RedisResult {
     Ok(().into())
 }
 
-fn add_info(ctx: &InfoContext, _for_crash_report: bool) -> RedisResult<()> {
+fn add_info(ctx: &InfoContext, _for_crash_report: bool) {
     if ctx.add_info_section(Some("test_helper")) == Status::Ok {
         ctx.add_info_field_str("field", "value");
     }
-
-    Ok(())
 }
 
 //////////////////////////////////////////////////////

src/context/mod.rs

@@ -1158,12 +1158,12 @@ impl<'a> InfoContextBuilder<'a> {
         self.sections
             .iter()
             .try_for_each(|(section_name, section_fields)| -> RedisResult<()> {
-                Into::<RedisResult<()>>::into(add_info_section(
-                    self.context.ctx,
-                    Some(section_name),
-                ))?;
-
-                self.add_top_level_fields(section_fields)
+                if add_info_section(self.context.ctx, Some(section_name)) == Status::Ok {
+                    self.add_top_level_fields(section_fields)
+                } else {
+                    // This section wasn't requested.
+                    Ok(())
+                }
             })
     }
 

src/macros.rs

@@ -156,12 +156,14 @@ macro_rules! redis_module {
         #[global_allocator]
         static REDIS_MODULE_ALLOCATOR: $allocator_type = $allocator_init;
 
-        // The info handler, if specified.
+        // The old-style info command handler, if specified.
         $(
             #[redis_module_macros::info_command_handler]
             #[inline]
             fn module_info(ctx: &InfoContext, for_crash_report: bool) -> RedisResult<()> {
-                $info_func(ctx, for_crash_report)
+                $info_func(ctx, for_crash_report);
+
+                Ok(())
             }
         )?