Merge pull request #4962 from youknowone/fix-ast

youknowone · web-flow · commit f3e4d3409253 · 2023-05-11T05:16:20.000+09:00
Revert a few .as_str() calls by adding it to ast
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -29,10 +29,10 @@ rustpython-pylib = { path = "pylib" }
 rustpython-stdlib = { path = "stdlib" }
 rustpython-doc = { git = "https://github.com/RustPython/__doc__", branch = "main" }
 
-rustpython-literal = { git = "https://github.com/youknowone/RustPython-parser.git", rev = "aa101e4f2693624eddabe35eaf3067bba65331df" }
-rustpython-parser-core = { git = "https://github.com/youknowone/RustPython-parser.git", rev = "aa101e4f2693624eddabe35eaf3067bba65331df" }
-rustpython-parser = { git = "https://github.com/youknowone/RustPython-parser.git", rev = "aa101e4f2693624eddabe35eaf3067bba65331df" }
-rustpython-ast = { git = "https://github.com/youknowone/RustPython-parser.git", rev = "aa101e4f2693624eddabe35eaf3067bba65331df" }
+rustpython-literal = { git = "https://github.com/youknowone/RustPython-parser.git", rev = "5b2af304a2baa53598e594097824165d4ac7a119" }
+rustpython-parser-core = { git = "https://github.com/youknowone/RustPython-parser.git", rev = "5b2af304a2baa53598e594097824165d4ac7a119" }
+rustpython-parser = { git = "https://github.com/youknowone/RustPython-parser.git", rev = "5b2af304a2baa53598e594097824165d4ac7a119" }
+rustpython-ast = { git = "https://github.com/youknowone/RustPython-parser.git", rev = "5b2af304a2baa53598e594097824165d4ac7a119" }
 # rustpython-literal = { path = "../RustPython-parser/literal" }
 # rustpython-parser-core = { path = "../RustPython-parser/core" }
 # rustpython-parser = { path = "../RustPython-parser/parser" }
diff --git a/compiler/codegen/src/compile.rs b/compiler/codegen/src/compile.rs
@@ -582,16 +582,16 @@ impl Compiler {
                         value: num_traits::Zero::zero(),
                     });
                     self.emit_constant(ConstantData::None);
-                    let idx = self.name(name.name.as_str());
+                    let idx = self.name(&name.name);
                     emit!(self, Instruction::ImportName { idx });
                     if let Some(alias) = &name.asname {
-                        for part in name.name.as_str().split('.').skip(1) {
+                        for part in name.name.split('.').skip(1) {
                             let idx = self.name(part);
                             emit!(self, Instruction::LoadAttr { idx });
                         }
                         self.store_name(alias.as_str())?
                     } else {
-                        self.store_name(name.name.as_str().split('.').next().unwrap())?
+                        self.store_name(name.name.split('.').next().unwrap())?
                     }
                 }
             }
@@ -600,7 +600,7 @@ impl Compiler {
                 module,
                 names,
             }) => {
-                let import_star = names.iter().any(|n| n.node.name.as_str() == "*");
+                let import_star = names.iter().any(|n| &n.node.name == "*");
 
                 let from_list = if import_star {
                     if self.ctx.in_func() {
diff --git a/compiler/codegen/src/symboltable.rs b/compiler/codegen/src/symboltable.rs
@@ -646,7 +646,7 @@ impl SymbolTableBuilder {
         if let ImportFrom(StmtImportFrom { module, names, .. }) = &statement.node {
             if module.as_ref().map(|id| id.as_str()) == Some("__future__") {
                 for feature in names {
-                    if feature.node.name.as_str() == "annotations" {
+                    if &feature.node.name == "annotations" {
                         self.future_annotations = true;
                     }
                 }
@@ -752,7 +752,7 @@ impl SymbolTableBuilder {
                     } else {
                         // `import module`
                         self.register_name(
-                            name.node.name.as_str().split('.').next().unwrap(),
+                            name.node.name.split('.').next().unwrap(),
                             SymbolUsage::Imported,
                             location,
                         )?;
