fix test

rust/candid/src/de.rs

@@ -805,19 +805,24 @@ impl<'de, 'a> de::MapAccess<'de> for Compound<'a, 'de> {
             } => {
                 match (expect.front(), wire.front()) {
                     (Some(e), Some(w)) => {
-                        if e.id.get_id() == w.id.get_id() {
-                            self.de.set_field_name(e.id.clone());
-                            self.de.expect_type = expect.pop_front().unwrap().ty;
-                            self.de.wire_type = wire.pop_front().unwrap().ty;
-                        } else if e.id.get_id() < w.id.get_id() {
-                            // by subtyping rules, expect_type can only be opt, reserved or null.
-                            self.de.set_field_name(e.id.clone());
-                            self.de.expect_type = expect.pop_front().unwrap().ty;
-                            self.de.wire_type = Type::Reserved;
-                        } else {
-                            self.de.set_field_name(Label::Named("_".to_owned()));
-                            self.de.wire_type = wire.pop_front().unwrap().ty;
-                            self.de.expect_type = Type::Reserved;
+                        use std::cmp::Ordering;
+                        match e.id.get_id().cmp(&w.id.get_id()) {
+                            Ordering::Equal => {
+                                self.de.set_field_name(e.id.clone());
+                                self.de.expect_type = expect.pop_front().unwrap().ty;
+                                self.de.wire_type = wire.pop_front().unwrap().ty;
+                            }
+                            Ordering::Less => {
+                                // by subtyping rules, expect_type can only be opt, reserved or null.
+                                self.de.set_field_name(e.id.clone());
+                                self.de.expect_type = expect.pop_front().unwrap().ty;
+                                self.de.wire_type = Type::Reserved;
+                            }
+                            Ordering::Greater => {
+                                self.de.set_field_name(Label::Named("_".to_owned()));
+                                self.de.wire_type = wire.pop_front().unwrap().ty;
+                                self.de.expect_type = Type::Reserved;
+                            }
                         }
                     }
                     (None, Some(_)) => {

rust/candid/src/utils.rs

@@ -44,7 +44,7 @@ macro_rules! Decode {
 ///
 /// ```
 /// # use candid::Encode;
-/// # use candid::de::decode_args;
+/// # use candid::decode_args;
 /// let golden1 = 123u64;
 /// let golden2 = "456";
 /// let bytes = Encode!(&golden1, &golden2).unwrap();
@@ -69,7 +69,7 @@ where
 ///
 /// ```
 /// # use candid::Encode;
-/// # use candid::de::decode_one;
+/// # use candid::decode_one;
 /// let golden1 = 123u64;
 /// let bytes = Encode!(&golden1).unwrap();
 /// let value1: u64 = decode_one(&bytes).unwrap();
@@ -88,7 +88,7 @@ where
 ///
 /// ```
 /// # use candid::Decode;
-/// # use candid::ser::write_args;
+/// # use candid::write_args;
 /// let golden1 = 1u64;
 /// let golden2 = "hello";
 /// let mut buffer = Vec::new();
@@ -111,7 +111,7 @@ pub fn write_args<Tuple: ArgumentEncoder, Writer: std::io::Write>(
 ///
 /// ```
 /// # use candid::Decode;
-/// # use candid::ser::encode_args;
+/// # use candid::encode_args;
 /// let golden1 = 1u64;
 /// let golden2 = "hello";
 /// let buffer = encode_args((golden1, golden2)).unwrap();
@@ -130,7 +130,7 @@ pub fn encode_args<Tuple: ArgumentEncoder>(arguments: Tuple) -> Result<Vec<u8>>
 ///
 /// ```
 /// # use candid::Decode;
-/// # use candid::ser::encode_one;
+/// # use candid::encode_one;
 /// let golden = "hello";
 /// let buffer = encode_one(golden).unwrap();
 ///

test/reference.test.did

@@ -55,9 +55,9 @@ assert blob "DIDL\00\01\6a\01\03\ca\ff\ee\01\61"    !: (func () -> ()) "func: no
 assert blob "DIDL\01\6a\01\69\01\7d\00\01\00\01\01\03\ca\ff\ee\03foo" !: (func (service {}) -> (nat)) "func: service not in type table";
 assert blob "DIDL\01\6a\01\71\01\7d\01\03\01\00\01\01\03\ca\ff\ee\03foo" !: (func (text) -> (nat)) "func: invalid annotation";
 
-// coercion does not look at type table
-assert blob "DIDL\01\69\00\01\00\01\03\ca\ff\ee" == "(service \"w7x7r-cok77-xa\")" : (service { foo : (text) -> (nat) }) "service {} decodes at service { foo : (text) -> (nat) }";
+// subtype
+assert blob "DIDL\01\69\00\01\00\01\03\ca\ff\ee"    !: (service { foo : (text) -> (nat) }) "service {} !<: service { foo : (text) -> (nat) }";
 assert blob "DIDL\02\6a\01\71\01\7d\00\69\01\03foo\00\01\01\01\03\ca\ff\ee" == "(service \"w7x7r-cok77-xa\")" : (service {}) "service { foo : (text) -> (nat) } decodes at service {}";
 
-assert blob "DIDL\01\6a\00\00\00\01\00\01\01\03\ca\ff\ee\03foo" == "(func \"w7x7r-cok77-xa\".foo)" : (func (text) -> (nat)) "func () -> () decodes at func (text) -> (nat) }";
-assert blob "DIDL\01\6a\01\71\01\7d\00\01\00\01\01\03\ca\ff\ee\03foo" == "(func \"w7x7r-cok77-xa\".foo)" : (func () -> ()) "func (text) -> (nat) decodes at func () -> () }";
+assert blob "DIDL\01\6a\00\00\00\01\00\01\01\03\ca\ff\ee\03foo" !: (func (text) -> (nat)) "func () -> () !<: (text) -> (nat) }";
+assert blob "DIDL\01\6a\01\71\01\7d\00\01\00\01\01\03\ca\ff\ee\03foo" == "(func \"w7x7r-cok77-xa\".foo)" : (func (text, opt text) -> ()) "func (text) -> (nat) decodes at func () -> () }";