Public/nushell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename parameter names in parameters

Browse Source
This commit is contained in:
WindSoilder 2024-06-19 17:04:52 +08:00
parent 892f358a94
commit 17f60e7ad5
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crates/nu-parser/src/parse_keywords.rs
View File

@ -1211,7 +1211,7 @@ pub fn parse_export_in_module(
working_set: &mut StateWorkingSet, working_set: &mut StateWorkingSet,
lite_command: &LiteCommand, lite_command: &LiteCommand,
module_name: &[u8], module_name: &[u8],
module: &mut Module, parent_module: &mut Module,
) -> (Pipeline, Vec<Exportable>) { ) -> (Pipeline, Vec<Exportable>) {
let spans = &lite_command.parts[..]; let spans = &lite_command.parts[..];
@ -1417,7 +1417,8 @@ pub fn parse_export_in_module(
pipe: lite_command.pipe, pipe: lite_command.pipe,
redirection: lite_command.redirection.clone(), redirection: lite_command.redirection.clone(),
}; };
let (pipeline, exportables) = parse_use(working_set, &lite_command, Some(module)); let (pipeline, exportables) =
parse_use(working_set, &lite_command, Some(parent_module));
let export_use_decl_id = if let Some(id) = working_set.find_decl(b"export use") { let export_use_decl_id = if let Some(id) = working_set.find_decl(b"export use") {
id id
@ -2265,7 +2266,7 @@ pub fn parse_module(
pub fn parse_use( pub fn parse_use(
working_set: &mut StateWorkingSet, working_set: &mut StateWorkingSet,
lite_command: &LiteCommand, lite_command: &LiteCommand,
user_module: Option<&mut Module>, parent_module: Option<&mut Module>,
) -> (Pipeline, Vec<Exportable>) { ) -> (Pipeline, Vec<Exportable>) {
let spans = &lite_command.parts; let spans = &lite_command.parts;
@ -2458,7 +2459,7 @@ pub fn parse_use(
import_pattern.constants = constants.iter().map(|(_, id)| *id).collect(); import_pattern.constants = constants.iter().map(|(_, id)| *id).collect();
if let Some(m) = user_module { if let Some(m) = parent_module {
m.track_imported_modules( m.track_imported_modules(
definitions definitions
.modules .modules

2
tests/modules/mod.rs
View File

@ -784,7 +784,7 @@ fn reload_submodules() {
#[test] #[test]
fn use_submodules() { fn use_submodules() {
Playground::setup("reload_submodule_changed_file", |dirs, sandbox| { Playground::setup("use_submodules", |dirs, sandbox| {
sandbox.with_files(&[ sandbox.with_files(&[
FileWithContent("voice.nu", r#"export use animals.nu"#), FileWithContent("voice.nu", r#"export use animals.nu"#),
FileWithContent("animals.nu", "export def cat [] { 'meow'}"), FileWithContent("animals.nu", "export def cat [] { 'meow'}"),