release (#281)

* release

* update candid ui

Changelog.md

@@ -1,6 +1,10 @@
 
 # Changelog
 
+## 2021-09-30 (Rust 0.7.8)
+
+* Fix `subtype` function to take only one env. To check subtyping from two did files, use `env.merge_type(env2, ty2)` to merge the env and rename variable names.
+
 ## 2021-09-09
 
 * Release ARM binary for `didc`

rust/candid/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "candid"
-version = "0.7.7"
+version = "0.7.8"
 edition = "2018"
 authors = ["DFINITY Team"]
 description = "Candid is an interface description language (IDL) for interacting with canisters running on the Internet Computer."

tools/didc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "didc"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["DFINITY Team"]
 edition = "2018"
 

tools/ui/src/didjs/lib.rs

@@ -66,7 +66,8 @@ fn subtype(new: String, old: String) -> Result<(), String> {
     let new_actor = check_prog(&mut new_env, &new).unwrap().unwrap();
     let old_actor = check_prog(&mut old_env, &old).unwrap().unwrap();
     let mut gamma = std::collections::HashSet::new();
-    subtype::subtype(&mut gamma, &new_env, &new_actor, &old_env, &old_actor)
+    let old_actor = new_env.merge_type(old_env, old_actor);
+    subtype::subtype(&mut gamma, &new_env, &new_actor, &old_actor)
         .or_else(|e| Err(e.to_string()))
 }