Fixing the interface

Author: MATATAT

mocktail/src/form.rs

@@ -7,14 +7,23 @@ pub struct FormBody {
 }
 
 impl FormBody {
+    /// Creates a new form.
+    pub fn new() -> Self {
+        Self { fields: Vec::new() }
+    }
+
     /// Creates an empty form.
     pub fn empty() -> Self {
         Self::default()
     }
 
     /// Adds a field to the form.
-    pub fn add_field(&mut self, name: impl Into<String>, value: impl Into<String>) {
-        self.fields.push((name.into(), value.into()));
+    pub fn field(self, name: impl Into<String>, value: impl Into<String>) -> Self {
+        let mut fields = self.fields;
+
+        fields.push((name.into(), value.into()));
+
+        Self { fields }
     }
 
     /// Converts the form body to a URL-encoded string.

mocktail/src/lib.rs

@@ -1,5 +1,6 @@
 #![doc = include_str!("../README.md")]
 pub mod body;
+pub mod form;
 mod headers;
 pub use headers::Headers;
 pub mod matchers;
@@ -18,6 +19,7 @@ pub use status::{Code, StatusCode};
 pub mod prelude {
     pub use crate::{
         body::Body,
+        form::FormBody,
         headers::Headers,
         matchers::*,
         mock::Mock,
@@ -30,7 +32,6 @@ pub mod prelude {
 }
 mod ext;
 mod service;
-mod form;
 
 /// Represents errors that can occur while serving mocks.
 #[derive(thiserror::Error, Debug)]

mocktail/src/mock_builder/when.rs

@@ -67,8 +67,8 @@ impl When {
     }
 
     /// Form Body.
-    pub fn form(self, body: FormBody) -> Self {
-        self.push(matchers::form(body));
+    pub fn form(self, form_body: FormBody) -> Self {
+        self.push(matchers::form(form_body));
         self
     }