diff --git a/Cargo.lock b/Cargo.lock index fe89682..a4434e4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -206,7 +206,7 @@ checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" [[package]] name = "els" version = "0.1.11" -source = "git+https://github.com/erg-lang/erg-language-server?branch=pylyzer-mode#8416017395fccea5bdf2632fd6b4f19dce23da67" +source = "git+https://github.com/erg-lang/erg-language-server?branch=main#abb84abd443dae865d7e3f8e486863837d451ccb" dependencies = [ "erg_common", "erg_compiler", @@ -227,7 +227,7 @@ dependencies = [ [[package]] name = "erg_common" version = "0.6.0-beta.2" -source = "git+https://github.com/erg-lang/erg?branch=pylyzer-mode#a805b1ed72135dcdd80064009849000163d8cbcf" +source = "git+https://github.com/erg-lang/erg?branch=main#8308d0b96518d7ee79fc378af74a630ded98f5c1" dependencies = [ "hermit-abi", "libc", @@ -237,7 +237,7 @@ dependencies = [ [[package]] name = "erg_compiler" version = "0.6.0-beta.2" -source = "git+https://github.com/erg-lang/erg?branch=pylyzer-mode#a805b1ed72135dcdd80064009849000163d8cbcf" +source = "git+https://github.com/erg-lang/erg?branch=main#8308d0b96518d7ee79fc378af74a630ded98f5c1" dependencies = [ "erg_common", "erg_parser", @@ -246,7 +246,7 @@ dependencies = [ [[package]] name = "erg_parser" version = "0.6.0-beta.2" -source = "git+https://github.com/erg-lang/erg?branch=pylyzer-mode#a805b1ed72135dcdd80064009849000163d8cbcf" +source = "git+https://github.com/erg-lang/erg?branch=main#8308d0b96518d7ee79fc378af74a630ded98f5c1" dependencies = [ "erg_common", "unicode-xid 0.2.4", diff --git a/Cargo.toml b/Cargo.toml index febd085..3255cca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ debug = ["erg_compiler/debug", "erg_common/debug"] [dependencies] rustpython-parser = "0.1.2" -erg_compiler = { git = "https://github.com/erg-lang/erg", branch = "pylyzer-mode" } -erg_common = { git = "https://github.com/erg-lang/erg", branch = "pylyzer-mode" } -els = { git = "https://github.com/erg-lang/erg-language-server", branch = "pylyzer-mode" } +erg_compiler = { git = "https://github.com/erg-lang/erg", branch = "main" } +erg_common = { git = "https://github.com/erg-lang/erg", branch = "main" } +els = { git = "https://github.com/erg-lang/erg-language-server", branch = "main" } py2erg = { path = "./crates/py2erg" } diff --git a/crates/py2erg/Cargo.toml b/crates/py2erg/Cargo.toml index d842c79..0a03d13 100644 --- a/crates/py2erg/Cargo.toml +++ b/crates/py2erg/Cargo.toml @@ -8,8 +8,8 @@ description = "A Python -> Erg converter" [dependencies] rustpython-parser = "0.1.2" -erg_compiler = { git = "https://github.com/erg-lang/erg", branch = "pylyzer-mode" } -erg_common = { git = "https://github.com/erg-lang/erg", branch = "pylyzer-mode" } +erg_compiler = { git = "https://github.com/erg-lang/erg", branch = "main" } +erg_common = { git = "https://github.com/erg-lang/erg", branch = "main" } [lib] path = "lib.rs" diff --git a/src/analyze.rs b/src/analyze.rs index 9d6466e..e5292f3 100644 --- a/src/analyze.rs +++ b/src/analyze.rs @@ -58,7 +58,7 @@ impl Buildable for PythonAnalyzer { self.analyze(code, mode) } fn pop_context(&mut self) -> Option { - Some(self.checker.pop_mod_ctx()) + self.checker.pop_mod_ctx() } fn get_context(&self) -> Option<&Context> { Some(self.checker.get_mod_ctx())