From c2b7e193788ca42f1ce07ab4a1bb404a799597ea Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Sat, 12 Jan 2019 22:00:46 +0100
Subject: [PATCH] Rename "compat" into "disable-validation", to insist on it
 breaking some guarantees.

---
 .gitlab-ci.yml         |  8 ++++----
 Cargo.toml             |  4 ++--
 src/attention.rs       |  6 +++---
 src/bind.rs            |  2 +-
 src/blocking.rs        |  4 ++--
 src/caps.rs            |  2 +-
 src/chatstates.rs      |  4 ++--
 src/jingle_ft.rs       |  6 +++---
 src/macros.rs          |  6 +++---
 src/message_correct.rs |  2 +-
 src/muc/muc.rs         |  2 +-
 src/muc/user.rs        | 10 +++++-----
 src/nick.rs            |  6 +++---
 src/ping.rs            |  6 +++---
 src/presence.rs        |  4 ++--
 src/pubsub/event.rs    |  2 +-
 src/roster.rs          |  2 +-
 src/sasl.rs            |  2 +-
 18 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ba174224..3f233d21 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,12 +18,12 @@ rust-nightly:
     - cargo build --verbose --no-default-features --features=$FEATURES
     - cargo test --verbose --no-default-features --features=$FEATURES
 
-"rust-latest with features=compat":
+"rust-latest with features=disable-validation":
   extends: rust-latest
   variables:
-    FEATURES: "compat"
+    FEATURES: "disable-validation"
 
-"rust-nightly with features=compat":
+"rust-nightly with features=disable-validation":
   extends: rust-nightly
   variables:
-    FEATURES: "compat"
+    FEATURES: "disable-validation"
diff --git a/Cargo.toml b/Cargo.toml
index 65935bab..0e3b9a36 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,5 +28,5 @@ try_from = "0.3.2"
 [features]
 # Build xmpp-parsers to make components instead of clients.
 component = []
-# Compatibility mode
-compat = []
+# Disable validation of unknown attributes.
+disable-validation = []
diff --git a/src/attention.rs b/src/attention.rs
index c786f313..bd4c7a15 100644
--- a/src/attention.rs
+++ b/src/attention.rs
@@ -18,7 +18,7 @@ impl MessagePayload for Attention {}
 #[cfg(test)]
 mod tests {
     use super::*;
-    #[cfg(not(feature = "compat"))]
+    #[cfg(not(feature = "disable-validation"))]
     use crate::error::Error;
     use minidom::Element;
     use try_from::TryFrom;
@@ -34,7 +34,7 @@ mod tests {
         Attention::try_from(elem).unwrap();
     }
 
-    #[cfg(not(feature = "compat"))]
+    #[cfg(not(feature = "disable-validation"))]
     #[test]
     fn test_invalid_child() {
         let elem: Element = "<attention xmlns='urn:xmpp:attention:0'><coucou/></attention>"
@@ -48,7 +48,7 @@ mod tests {
         assert_eq!(message, "Unknown child in attention element.");
     }
 
-    #[cfg(not(feature = "compat"))]
+    #[cfg(not(feature = "disable-validation"))]
     #[test]
     fn test_invalid_attribute() {
         let elem: Element = "<attention xmlns='urn:xmpp:attention:0' coucou=''/>"
diff --git a/src/bind.rs b/src/bind.rs
index bd09d4f3..9d3a894f 100644
--- a/src/bind.rs
+++ b/src/bind.rs
@@ -112,7 +112,7 @@ mod tests {
         assert_eq!(bind, Bind::None);
     }
 
-    #[cfg(not(feature = "compat"))]
+    #[cfg(not(feature = "disable-validation"))]
     #[test]
     fn test_invalid_resource() {
         let elem: Element = "<bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'><resource attr='coucou'>resource</resource></bind>"
diff --git a/src/blocking.rs b/src/blocking.rs
index e12e7e49..53417f7f 100644
--- a/src/blocking.rs
+++ b/src/blocking.rs
@@ -168,7 +168,7 @@ mod tests {
         assert_eq!(unblock.items, two_items);
     }
 
-    #[cfg(not(feature = "compat"))]
+    #[cfg(not(feature = "disable-validation"))]
     #[test]
     fn test_invalid() {
         let elem: Element = "<blocklist xmlns='urn:xmpp:blocking' coucou=''/>"
@@ -211,7 +211,7 @@ mod tests {
         assert_eq!(message, "Unknown attribute in unblock element.");
     }
 
-    #[cfg(not(feature = "compat"))]
+    #[cfg(not(feature = "disable-validation"))]
     #[test]
     fn test_non_empty_blocklist_request() {
         let elem: Element = "<blocklist xmlns='urn:xmpp:blocking'><item jid='coucou@coucou'/><item jid='domain'/></blocklist>".parse().unwrap();
diff --git a/src/caps.rs b/src/caps.rs
index 3befdc9b..74042be3 100644
--- a/src/caps.rs
+++ b/src/caps.rs
@@ -233,7 +233,7 @@ mod tests {
         );
     }
 
-    #[cfg(not(feature = "compat"))]
+    #[cfg(not(feature = "disable-validation"))]
     #[test]
     fn test_invalid_child() {
         let elem: Element = "<c xmlns='http://jabber.org/protocol/caps'><hash xmlns='urn:xmpp:hashes:2' algo='sha-256'>K1Njy3HZBThlo4moOD5gBGhn0U0oK7/CbfLlIUDi6o4=</hash></c>".parse().unwrap();
diff --git a/src/chatstates.rs b/src/chatstates.rs
index 9a972aa7..4eb173f1 100644
--- a/src/chatstates.rs
+++ b/src/chatstates.rs
@@ -63,7 +63,7 @@ mod tests {
         assert_eq!(message, "This is not a chatstate element.");
     }
 
-    #[cfg(not(feature = "compat"))]
+    #[cfg(not(feature = "disable-validation"))]
     #[test]
     fn test_invalid_child() {
         let elem: Element = "<gone xmlns='http://jabber.org/protocol/chatstates'><coucou/></gone>"
@@ -77,7 +77,7 @@ mod tests {
         assert_eq!(message, "Unknown child in chatstate element.");
     }
 
-    #[cfg(not(feature = "compat"))]
+    #[cfg(not(feature = "disable-validation"))]
     #[test]
     fn test_invalid_attribute() {
         let elem: Element = "<inactive xmlns='http://jabber.org/protocol/chatstates' coucou=''/>"
diff --git a/src/jingle_ft.rs b/src/jingle_ft.rs
index d9a73b29..32dd41f6 100644
--- a/src/jingle_ft.rs
+++ b/src/jingle_ft.rs
@@ -530,7 +530,7 @@ mod tests {
         assert_eq!(message, "Unknown value for 'creator' attribute.");
     }
 
-    #[cfg(not(feature = "compat"))]
+    #[cfg(not(feature = "disable-validation"))]
     #[test]
     fn test_invalid_received() {
         let elem: Element = "<received xmlns='urn:xmpp:jingle:apps:file-transfer:5' name='coucou' creator='initiator' coucou=''/>".parse().unwrap();
@@ -596,7 +596,7 @@ mod tests {
         assert_eq!(message, "Unknown value for 'creator' attribute.");
     }
 
-    #[cfg(not(feature = "compat"))]
+    #[cfg(not(feature = "disable-validation"))]
     #[test]
     fn test_invalid_checksum() {
         let elem: Element = "<checksum xmlns='urn:xmpp:jingle:apps:file-transfer:5' name='coucou' creator='initiator' coucou=''><file><hash xmlns='urn:xmpp:hashes:2' algo='sha-1'>w0mcJylzCn+AfvuGdqkty2+KP48=</hash></file></checksum>".parse().unwrap();
@@ -637,7 +637,7 @@ mod tests {
         assert_eq!(range2.hashes, hashes);
     }
 
-    #[cfg(not(feature = "compat"))]
+    #[cfg(not(feature = "disable-validation"))]
     #[test]
     fn test_invalid_range() {
         let elem: Element = "<range xmlns='urn:xmpp:jingle:apps:file-transfer:5' coucou=''/>"
diff --git a/src/macros.rs b/src/macros.rs
index daccec5c..aa89a45c 100644
--- a/src/macros.rs
+++ b/src/macros.rs
@@ -248,7 +248,7 @@ macro_rules! check_ns_only {
 
 macro_rules! check_no_children {
     ($elem:ident, $name:tt) => {
-        #[cfg(not(feature = "compat"))]
+        #[cfg(not(feature = "disable-validation"))]
         for _ in $elem.children() {
             return Err(crate::error::Error::ParseError(concat!(
                 "Unknown child in ",
@@ -261,7 +261,7 @@ macro_rules! check_no_children {
 
 macro_rules! check_no_attributes {
     ($elem:ident, $name:tt) => {
-        #[cfg(not(feature = "compat"))]
+        #[cfg(not(feature = "disable-validation"))]
         for _ in $elem.attrs() {
             return Err(crate::error::Error::ParseError(concat!(
                 "Unknown attribute in ",
@@ -274,7 +274,7 @@ macro_rules! check_no_attributes {
 
 macro_rules! check_no_unknown_attributes {
     ($elem:ident, $name:tt, [$($attr:tt),*]) => (
-        #[cfg(not(feature = "compat"))]
+        #[cfg(not(feature = "disable-validation"))]
         for (_attr, _) in $elem.attrs() {
             $(
                 if _attr == $attr {
diff --git a/src/message_correct.rs b/src/message_correct.rs
index e0d22d62..3bba10e7 100644
--- a/src/message_correct.rs
+++ b/src/message_correct.rs
@@ -45,7 +45,7 @@ mod tests {
         Replace::try_from(elem).unwrap();
     }
 
-    #[cfg(not(feature = "compat"))]
+    #[cfg(not(feature = "disable-validation"))]
     #[test]
     fn test_invalid_attribute() {
         let elem: Element = "<replace xmlns='urn:xmpp:message-correct:0' coucou=''/>"
diff --git a/src/muc/muc.rs b/src/muc/muc.rs
index 40528383..fc596fa9 100644
--- a/src/muc/muc.rs
+++ b/src/muc/muc.rs
@@ -142,7 +142,7 @@ mod tests {
         assert_eq!(elem, elem2);
     }
 
-    #[cfg(not(feature = "compat"))]
+    #[cfg(not(feature = "disable-validation"))]
     #[test]
     fn test_muc_invalid_attribute() {
         let elem: Element = "<x xmlns='http://jabber.org/protocol/muc' coucou=''/>"
diff --git a/src/muc/user.rs b/src/muc/user.rs
index a104e319..56c111e8 100644
--- a/src/muc/user.rs
+++ b/src/muc/user.rs
@@ -303,7 +303,7 @@ mod tests {
         assert!(elem.compare_to(&elem2));
     }
 
-    #[cfg(not(feature = "compat"))]
+    #[cfg(not(feature = "disable-validation"))]
     #[test]
     fn test_invalid_attribute() {
         let elem: Element = "
@@ -344,7 +344,7 @@ mod tests {
         assert_eq!(message, "Required attribute 'code' missing.");
     }
 
-    #[cfg(not(feature = "compat"))]
+    #[cfg(not(feature = "disable-validation"))]
     #[test]
     fn test_status_invalid_child() {
         let elem: Element = "
@@ -515,7 +515,7 @@ mod tests {
         assert_eq!(reason.0, "Reason".to_owned());
     }
 
-    #[cfg(not(feature = "compat"))]
+    #[cfg(not(feature = "disable-validation"))]
     #[test]
     fn test_reason_invalid_attribute() {
         let elem: Element = "
@@ -531,7 +531,7 @@ mod tests {
         assert_eq!(message, "Unknown attribute in reason element.".to_owned());
     }
 
-    #[cfg(not(feature = "compat"))]
+    #[cfg(not(feature = "disable-validation"))]
     #[test]
     fn test_reason_invalid() {
         let elem: Element = "
@@ -549,7 +549,7 @@ mod tests {
         assert_eq!(message, "Unknown child in reason element.".to_owned());
     }
 
-    #[cfg(not(feature = "compat"))]
+    #[cfg(not(feature = "disable-validation"))]
     #[test]
     fn test_item_invalid_attr() {
         let elem: Element = "
diff --git a/src/nick.rs b/src/nick.rs
index 67a45ff9..03f544aa 100644
--- a/src/nick.rs
+++ b/src/nick.rs
@@ -14,7 +14,7 @@ generate_elem_id!(
 #[cfg(test)]
 mod tests {
     use super::*;
-    #[cfg(not(feature = "compat"))]
+    #[cfg(not(feature = "disable-validation"))]
     use crate::error::Error;
     use minidom::Element;
     use try_from::TryFrom;
@@ -49,7 +49,7 @@ mod tests {
         assert_eq!(elem1, elem2);
     }
 
-    #[cfg(not(feature = "compat"))]
+    #[cfg(not(feature = "disable-validation"))]
     #[test]
     fn test_invalid() {
         let elem: Element = "<nick xmlns='http://jabber.org/protocol/nick'><coucou/></nick>"
@@ -63,7 +63,7 @@ mod tests {
         assert_eq!(message, "Unknown child in nick element.");
     }
 
-    #[cfg(not(feature = "compat"))]
+    #[cfg(not(feature = "disable-validation"))]
     #[test]
     fn test_invalid_attribute() {
         let elem: Element = "<nick xmlns='http://jabber.org/protocol/nick' coucou=''/>"
diff --git a/src/ping.rs b/src/ping.rs
index 6f48dd55..01853120 100644
--- a/src/ping.rs
+++ b/src/ping.rs
@@ -20,7 +20,7 @@ impl IqGetPayload for Ping {}
 #[cfg(test)]
 mod tests {
     use super::*;
-    #[cfg(not(feature = "compat"))]
+    #[cfg(not(feature = "disable-validation"))]
     use crate::error::Error;
     use minidom::Element;
     use try_from::TryFrom;
@@ -43,7 +43,7 @@ mod tests {
         assert_eq!(elem1, elem2);
     }
 
-    #[cfg(not(feature = "compat"))]
+    #[cfg(not(feature = "disable-validation"))]
     #[test]
     fn test_invalid() {
         let elem: Element = "<ping xmlns='urn:xmpp:ping'><coucou/></ping>"
@@ -57,7 +57,7 @@ mod tests {
         assert_eq!(message, "Unknown child in ping element.");
     }
 
-    #[cfg(not(feature = "compat"))]
+    #[cfg(not(feature = "disable-validation"))]
     #[test]
     fn test_invalid_attribute() {
         let elem: Element = "<ping xmlns='urn:xmpp:ping' coucou=''/>".parse().unwrap();
diff --git a/src/presence.rs b/src/presence.rs
index 20d63e87..7e3e8aa8 100644
--- a/src/presence.rs
+++ b/src/presence.rs
@@ -570,7 +570,7 @@ mod tests {
         assert!(payload.is("test", "invalid"));
     }
 
-    #[cfg(not(feature = "compat"))]
+    #[cfg(not(feature = "disable-validation"))]
     #[test]
     fn test_invalid_status_child() {
         #[cfg(not(feature = "component"))]
@@ -590,7 +590,7 @@ mod tests {
         assert_eq!(message, "Unknown child in status element.");
     }
 
-    #[cfg(not(feature = "compat"))]
+    #[cfg(not(feature = "disable-validation"))]
     #[test]
     fn test_invalid_attribute() {
         #[cfg(not(feature = "component"))]
diff --git a/src/pubsub/event.rs b/src/pubsub/event.rs
index 0cad1cc0..0cef2c39 100644
--- a/src/pubsub/event.rs
+++ b/src/pubsub/event.rs
@@ -420,7 +420,7 @@ mod tests {
         assert_eq!(message, "Unknown child in event element.");
     }
 
-    #[cfg(not(feature = "compat"))]
+    #[cfg(not(feature = "disable-validation"))]
     #[test]
     fn test_invalid_attribute() {
         let elem: Element = "<event xmlns='http://jabber.org/protocol/pubsub#event' coucou=''/>"
diff --git a/src/roster.rs b/src/roster.rs
index c0d869d1..c13b0f59 100644
--- a/src/roster.rs
+++ b/src/roster.rs
@@ -245,7 +245,7 @@ mod tests {
         assert_eq!(roster.items[0].subscription, Subscription::Remove);
     }
 
-    #[cfg(not(feature = "compat"))]
+    #[cfg(not(feature = "disable-validation"))]
     #[test]
     fn test_invalid() {
         let elem: Element = "<query xmlns='jabber:iq:roster'><coucou/></query>"
diff --git a/src/sasl.rs b/src/sasl.rs
index 6f922901..45a56653 100644
--- a/src/sasl.rs
+++ b/src/sasl.rs
@@ -289,7 +289,7 @@ mod tests {
         );
     }
 
-    #[cfg(feature = "compat")]
+    #[cfg(feature = "disable-validation")]
     #[test]
     fn failure_with_non_prefixed_text_lang() {
         let elem: Element = "<failure xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>