From 8c57f433ff059a77a055dc9e7f22c41f68e42d87 Mon Sep 17 00:00:00 2001
From: John Heitmann <jheitmann@gmail.com>
Date: Mon, 11 Jan 2016 10:20:07 -0800
Subject: [PATCH] s/disallow_unknown/deny_unknown_fields/

---
 README.md                             |  2 +-
 serde_codegen/src/attr.rs             | 20 ++++++++++----------
 serde_codegen/src/de.rs               |  8 ++++----
 serde_tests/tests/test_annotations.rs |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index b78781ad..fec82608 100644
--- a/README.md
+++ b/README.md
@@ -600,7 +600,7 @@ Structure Annotations:
 
 | Annotation                  | Function                                                                                                                                           |
 | ----------                  | --------                                                                                                                                           |
-| `#[serde(disallow_unknown)` | Always error during serialization when encountering unknown fields. When absent, unknown fields are ignored for self-describing formats like JSON. |
+| `#[serde(deny_unknown_fields)` | Always error during serialization when encountering unknown fields. When absent, unknown fields are ignored for self-describing formats like JSON. |
 
 
 Serialization Formats Using Serde
diff --git a/serde_codegen/src/attr.rs b/serde_codegen/src/attr.rs
index 3932dbb2..d71ef09f 100644
--- a/serde_codegen/src/attr.rs
+++ b/serde_codegen/src/attr.rs
@@ -247,23 +247,23 @@ impl<'a> FieldAttrsBuilder<'a> {
 /// Represents container (e.g. struct) attribute information
 #[derive(Debug)]
 pub struct ContainerAttrs {
-    disallow_unknown: bool,
+    deny_unknown_fields: bool,
 }
 
 impl ContainerAttrs {
-    pub fn disallow_unknown(&self) -> bool {
-        self.disallow_unknown
+    pub fn deny_unknown_fields(&self) -> bool {
+        self.deny_unknown_fields
     }
 }
 
 pub struct ContainerAttrsBuilder {
-    disallow_unknown: bool,
+    deny_unknown_fields: bool,
 }
 
 impl ContainerAttrsBuilder {
     pub fn new() -> ContainerAttrsBuilder {
         ContainerAttrsBuilder {
-            disallow_unknown: false,
+            deny_unknown_fields: false,
         }
     }
 
@@ -285,8 +285,8 @@ impl ContainerAttrsBuilder {
 
     pub fn meta_item(self, meta_item: &P<ast::MetaItem>) -> ContainerAttrsBuilder {
         match meta_item.node {
-            ast::MetaWord(ref name) if name == &"disallow_unknown" => {
-                self.disallow_unknown()
+            ast::MetaWord(ref name) if name == &"deny_unknown_fields" => {
+                self.deny_unknown_fields()
             }
             _ => {
                 // Ignore unknown meta variables for now.
@@ -295,14 +295,14 @@ impl ContainerAttrsBuilder {
         }
     }
 
-    pub fn disallow_unknown(mut self) -> ContainerAttrsBuilder {
-        self.disallow_unknown = true;
+    pub fn deny_unknown_fields(mut self) -> ContainerAttrsBuilder {
+        self.deny_unknown_fields = true;
         self
     }
 
     pub fn build(self) -> ContainerAttrs {
         ContainerAttrs {
-            disallow_unknown: self.disallow_unknown,
+            deny_unknown_fields: self.deny_unknown_fields,
         }
     }
 }
diff --git a/serde_codegen/src/de.rs b/serde_codegen/src/de.rs
index 82bc567d..97d60054 100644
--- a/serde_codegen/src/de.rs
+++ b/serde_codegen/src/de.rs
@@ -567,7 +567,7 @@ fn deserialize_item_enum(
         const VARIANTS: &'static [&'static str] = $variants_expr;
     ).unwrap();
 
-    let ignored_arm = if !container_attrs.disallow_unknown() {
+    let ignored_arm = if !container_attrs.deny_unknown_fields() {
         Some(quote_arm!(cx, __Field::__ignore => { Err(::serde::de::Error::end_of_stream()) }))
     } else {
         None
@@ -800,7 +800,7 @@ fn deserialize_field_visitor(
         .map(|i| builder.id(format!("__field{}", i)))
         .collect();
 
-    let ignore_variant = if !container_attrs.disallow_unknown() {
+    let ignore_variant = if !container_attrs.deny_unknown_fields() {
         let skip_ident = builder.id("__ignore");
         Some(builder.variant(skip_ident).unit())
     } else {
@@ -848,7 +848,7 @@ fn deserialize_field_visitor(
         })
         .collect();
 
-    let fallthrough_arm_expr = if !container_attrs.disallow_unknown() {
+    let fallthrough_arm_expr = if !container_attrs.deny_unknown_fields() {
         quote_expr!(cx, Ok(__Field::__ignore))
     } else {
         quote_expr!(cx, Err(::serde::de::Error::unknown_field(value)))
@@ -1012,7 +1012,7 @@ fn deserialize_map(
 
 
     // Visit ignored values to consume them
-    let ignored_arm = if !container_attrs.disallow_unknown() {
+    let ignored_arm = if !container_attrs.deny_unknown_fields() {
         Some(quote_arm!(cx,
             _ => { try!(visitor.visit_value::<::serde::de::impls::IgnoredAny>()); }
         ))
diff --git a/serde_tests/tests/test_annotations.rs b/serde_tests/tests/test_annotations.rs
index f53f08e1..dc91b9b5 100644
--- a/serde_tests/tests/test_annotations.rs
+++ b/serde_tests/tests/test_annotations.rs
@@ -17,7 +17,7 @@ struct Default {
 }
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
-#[serde(disallow_unknown)]
+#[serde(deny_unknown_fields)]
 struct DisallowUnknown {
     a1: i32,
 }