diff --git a/Cargo.lock b/Cargo.lock index a971434..3f608ca 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -109,9 +109,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "cpufeatures" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] @@ -152,8 +152,8 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "els" -version = "0.1.28-nightly.5" -source = "git+https://github.com/erg-lang/erg?branch=main#6db84abcb2e50a32162a0e0a95de8b0cb6822b19" +version = "0.1.28-nightly.7" +source = "git+https://github.com/erg-lang/erg?branch=main#76e91dcb0f35f9ebdb19d1350edd779b970944aa" dependencies = [ "erg_common", "erg_compiler", @@ -176,8 +176,8 @@ dependencies = [ [[package]] name = "erg_common" -version = "0.6.16-nightly.5" -source = "git+https://github.com/erg-lang/erg?branch=main#6db84abcb2e50a32162a0e0a95de8b0cb6822b19" +version = "0.6.16-nightly.7" +source = "git+https://github.com/erg-lang/erg?branch=main#76e91dcb0f35f9ebdb19d1350edd779b970944aa" dependencies = [ "backtrace-on-stack-overflow", "parking_lot", @@ -186,8 +186,8 @@ dependencies = [ [[package]] name = "erg_compiler" -version = "0.6.16-nightly.5" -source = "git+https://github.com/erg-lang/erg?branch=main#6db84abcb2e50a32162a0e0a95de8b0cb6822b19" +version = "0.6.16-nightly.7" +source = "git+https://github.com/erg-lang/erg?branch=main#76e91dcb0f35f9ebdb19d1350edd779b970944aa" dependencies = [ "erg_common", "erg_parser", @@ -195,8 +195,8 @@ dependencies = [ [[package]] name = "erg_parser" -version = "0.6.16-nightly.5" -source = "git+https://github.com/erg-lang/erg?branch=main#6db84abcb2e50a32162a0e0a95de8b0cb6822b19" +version = "0.6.16-nightly.7" +source = "git+https://github.com/erg-lang/erg?branch=main#76e91dcb0f35f9ebdb19d1350edd779b970944aa" dependencies = [ "erg_common", "unicode-xid", @@ -281,9 +281,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0aa48fab2893d8a49caa94082ae8488f4e1050d73b367881dcd2198f4199fd8" +checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" [[package]] name = "keccak" @@ -496,9 +496,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35" [[package]] name = "percent-encoding" @@ -749,9 +749,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" [[package]] name = "scopeguard" @@ -767,18 +767,18 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.164" +version = "1.0.166" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.164" +version = "1.0.166" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6" dependencies = [ "proc-macro2", "quote", @@ -787,9 +787,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.99" +version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" +checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c" dependencies = [ "itoa", "ryu", @@ -798,9 +798,9 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.12" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" +checksum = "1d89a8107374290037607734c0b73a85db7ed80cae314b3c5791f192a496e731" dependencies = [ "proc-macro2", "quote", @@ -827,9 +827,9 @@ checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "static_assertions" @@ -959,9 +959,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" [[package]] name = "unicode-normalization" 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; }