mirror of
https://github.com/nushell/nushell.git
synced 2025-05-11 13:34:26 +02:00
fix(parser): namespace pollution of constants by use module_name
This commit is contained in:
parent
0f8f3bcf9a
commit
d6e6a90b3a
@ -128,7 +128,6 @@ impl Module {
|
|||||||
} else {
|
} else {
|
||||||
// Import pattern was just name without any members
|
// Import pattern was just name without any members
|
||||||
let mut decls = vec![];
|
let mut decls = vec![];
|
||||||
let mut const_vids = vec![];
|
|
||||||
let mut const_rows = vec![];
|
let mut const_rows = vec![];
|
||||||
let mut errors = vec![];
|
let mut errors = vec![];
|
||||||
|
|
||||||
@ -154,7 +153,6 @@ impl Module {
|
|||||||
decls.push((new_name, sub_decl_id));
|
decls.push((new_name, sub_decl_id));
|
||||||
}
|
}
|
||||||
|
|
||||||
const_vids.extend(sub_results.constants);
|
|
||||||
const_rows.extend(sub_results.constant_values);
|
const_rows.extend(sub_results.constant_values);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -162,10 +160,7 @@ impl Module {
|
|||||||
|
|
||||||
for (name, var_id) in self.consts() {
|
for (name, var_id) in self.consts() {
|
||||||
match working_set.get_constant(var_id) {
|
match working_set.get_constant(var_id) {
|
||||||
Ok(const_val) => {
|
Ok(const_val) => const_rows.push((name, const_val.clone())),
|
||||||
const_vids.push((name.clone(), var_id));
|
|
||||||
const_rows.push((name, const_val.clone()))
|
|
||||||
}
|
|
||||||
Err(err) => errors.push(err),
|
Err(err) => errors.push(err),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -192,7 +187,7 @@ impl Module {
|
|||||||
ResolvedImportPattern::new(
|
ResolvedImportPattern::new(
|
||||||
decls,
|
decls,
|
||||||
vec![(final_name.clone(), self_id)],
|
vec![(final_name.clone(), self_id)],
|
||||||
const_vids,
|
vec![],
|
||||||
constant_values,
|
constant_values,
|
||||||
),
|
),
|
||||||
errors,
|
errors,
|
||||||
|
Loading…
Reference in New Issue
Block a user