From bbe3bc39aba4916077059c12c01b5543a41fa88f Mon Sep 17 00:00:00 2001
From: Shunsuke Shibayama <sbym1346@gmail.com>
Date: Fri, 7 Jul 2023 01:19:28 +0900
Subject: [PATCH] build: update deps & internal changes

---
 Cargo.lock                | 16 ++++++++--------
 Cargo.toml                |  6 +++---
 crates/py2erg/gen_decl.rs |  9 +++++----
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 91fa96b..4e80c79 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -252,9 +252,9 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
 
 [[package]]
 name = "els"
-version = "0.1.28-nightly.6"
+version = "0.1.28-nightly.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89d5f9be721f6c4eebbaed9252eed1ea80c6f1eb9d62d5381b8af3070f583170"
+checksum = "59e54b5527e4aae01813772f4e7eed9f8dbe6966c14fc2c3e10eddabfb7486a7"
 dependencies = [
  "erg_common",
  "erg_compiler",
@@ -274,9 +274,9 @@ dependencies = [
 
 [[package]]
 name = "erg_common"
-version = "0.6.16-nightly.6"
+version = "0.6.16-nightly.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca973cb87fe95b78d16d7efcb600a7b806dd0f7746143eaf785358d08dec545b"
+checksum = "5c55887471b1c888138ea9aacc9ac06f03b90b5d2e12b5223df5e1e2e5b28512"
 dependencies = [
  "backtrace-on-stack-overflow",
  "parking_lot",
@@ -285,9 +285,9 @@ dependencies = [
 
 [[package]]
 name = "erg_compiler"
-version = "0.6.16-nightly.6"
+version = "0.6.16-nightly.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a41c6ec328f24694a6ada250e5c9159576dde92c25f7a176db1c180b83f633d5"
+checksum = "a224d2547116ef86ca1943a24791e2533b331127db9701b5bc6aec0017ba1c7f"
 dependencies = [
  "erg_common",
  "erg_parser",
@@ -295,9 +295,9 @@ dependencies = [
 
 [[package]]
 name = "erg_parser"
-version = "0.6.16-nightly.6"
+version = "0.6.16-nightly.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb5e83ccfe4f35712f8759d29b980e78800801f3847fcbe4d7ef12968e7c856c"
+checksum = "42d1db8387f29098b956d02f840913abb1230cda6732c07c2c1bb891bea5671b"
 dependencies = [
  "erg_common",
  "unicode-xid 0.2.4",
diff --git a/Cargo.toml b/Cargo.toml
index 373ccdc..f454218 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,9 +22,9 @@ edition = "2021"
 repository = "https://github.com/mtshiba/pylyzer"
 
 [workspace.dependencies]
-erg_common = { version = "0.6.16-nightly.6", features = ["py_compat", "els"] }
-erg_compiler = { version = "0.6.16-nightly.6", features = ["py_compat", "els"] }
-els = { version = "0.1.28-nightly.6", features = ["py_compat"] }
+erg_common = { version = "0.6.16-nightly.7", features = ["py_compat", "els"] }
+erg_compiler = { version = "0.6.16-nightly.7", features = ["py_compat", "els"] }
+els = { version = "0.1.28-nightly.7", features = ["py_compat"] }
 rustpython-parser = "0.1.2"
 # erg_compiler = { git = "https://github.com/erg-lang/erg", branch = "main", features = ["py_compat", "els"] }
 # erg_common = { git = "https://github.com/erg-lang/erg", branch = "main", features = ["py_compat", "els"] }
diff --git a/crates/py2erg/gen_decl.rs b/crates/py2erg/gen_decl.rs
index 0886567..a110291 100644
--- a/crates/py2erg/gen_decl.rs
+++ b/crates/py2erg/gen_decl.rs
@@ -3,6 +3,7 @@ use std::io::{BufWriter, Write};
 
 use erg_common::io::Input;
 use erg_common::log;
+use erg_common::traits::LimitedDisplay;
 use erg_compiler::context::register::{CheckStatus, PylyzerStatus};
 use erg_compiler::hir::{Expr, HIR};
 use erg_compiler::ty::value::{GenTypeObj, TypeObj};
@@ -68,7 +69,7 @@ impl DeclFileGenerator {
                     .replace('\0', "")
                     .replace('%', "___");
                 let ref_t = def.sig.ident().ref_t();
-                let typ = ref_t.replace_failure().to_string();
+                let typ = ref_t.replace_failure().to_string_unabbreviated();
                 let typ = escape_type(typ);
                 // Erg can automatically import nested modules
                 // `import http.client` => `http = pyimport "http"`
@@ -97,7 +98,7 @@ impl DeclFileGenerator {
                 self.code += &decl;
                 self.code.push('\n');
                 if let GenTypeObj::Subclass(class) = &def.obj {
-                    let sup = class.sup.as_ref().typ().to_string();
+                    let sup = class.sup.as_ref().typ().to_string_unabbreviated();
                     let sup = escape_type(sup);
                     let decl = format!(".{class_name} <: {sup}\n");
                     self.code += &decl;
@@ -108,7 +109,7 @@ impl DeclFileGenerator {
                 }) = def.obj.base_or_sup()
                 {
                     for (attr, t) in rec.iter() {
-                        let typ = escape_type(t.to_string());
+                        let typ = escape_type(t.to_string_unabbreviated());
                         let decl = format!("{}.{}: {typ}\n", self.namespace, attr.symbol);
                         self.code += &decl;
                     }
@@ -119,7 +120,7 @@ impl DeclFileGenerator {
                 }) = def.obj.additional()
                 {
                     for (attr, t) in rec.iter() {
-                        let typ = escape_type(t.to_string());
+                        let typ = escape_type(t.to_string_unabbreviated());
                         let decl = format!("{}.{}: {typ}\n", self.namespace, attr.symbol);
                         self.code += &decl;
                     }