Group quoted blocks in csv::from_comma_delimited

Author: akonradi-signal

src/common/cache_control.rs

@@ -489,12 +489,7 @@ mod tests {
     fn test_parse_quoted_comma() {
         assert_eq!(
             test_decode::<CacheControl>(&["foo=\"a, private, immutable, b\", no-cache"]).unwrap(),
-            CacheControl::new()
-                .with_no_cache()
-                // These are wrong: these appear inside a quoted string and so
-                // should be treated as parameter for the "a" directive.
-                .with_private()
-                .with_immutable(),
+            CacheControl::new().with_no_cache(),
             "unknown extensions are ignored but shouldn't fail parsing",
         )
     }

src/util/csv.rs

@@ -14,8 +14,26 @@ where
     values
         .flat_map(|value| {
             value.to_str().into_iter().flat_map(|string| {
+                let mut in_quotes = false;
                 string
-                    .split(',')
+                    .split(move |c| {
+                        #[allow(clippy::collapsible_else_if)]
+                        if in_quotes {
+                            if c == '"' {
+                                in_quotes = false;
+                            }
+                            false // dont split
+                        } else {
+                            if c == ',' {
+                                true // split
+                            } else {
+                                if c == '"' {
+                                    in_quotes = true;
+                                }
+                                false // dont split
+                            }
+                        }
+                    })
                     .filter_map(|x| match x.trim() {
                         "" => None,
                         y => Some(y),