chore: cargo fmt
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
use std::rc::Rc;
|
||||
use hashbrown::HashMap;
|
||||
use std::rc::Rc;
|
||||
|
||||
use crate::ty::internal::{AttrSet, Value};
|
||||
|
||||
@@ -16,7 +16,7 @@ impl<'vm> Env<'vm> {
|
||||
|
||||
pub fn lookup(&self, symbol: usize) -> Option<Value<'vm>> {
|
||||
if let Some(val) = self.map.get(&symbol).cloned() {
|
||||
return Some(val)
|
||||
return Some(val);
|
||||
}
|
||||
self.last.as_ref().map(|env| env.lookup(symbol)).flatten()
|
||||
}
|
||||
@@ -26,10 +26,6 @@ impl<'vm> Env<'vm> {
|
||||
}
|
||||
|
||||
pub fn enter(self, new: impl Iterator<Item = (usize, Value<'vm>)>) -> Self {
|
||||
/* let mut map = self.map.clone();
|
||||
for (k, v) in new {
|
||||
map.insert_mut(k, v);
|
||||
} */
|
||||
let map = Rc::new(new.collect());
|
||||
let last = Some(
|
||||
Env {
|
||||
@@ -42,22 +38,21 @@ impl<'vm> Env<'vm> {
|
||||
}
|
||||
|
||||
pub fn enter_with(self, new: Rc<AttrSet<'vm>>) -> Self {
|
||||
/* let mut map = self.map.clone();
|
||||
for (k, v) in new.as_inner().iter() {
|
||||
let v = if let Value::Builtins = v {
|
||||
Value::AttrSet(new.clone())
|
||||
} else {
|
||||
v.clone()
|
||||
};
|
||||
map.insert_mut(k.clone(), v);
|
||||
} */
|
||||
let map = Rc::new(new.as_inner().iter().map(|(&k, v)| {
|
||||
(k, if let Value::Builtins = v {
|
||||
Value::AttrSet(new.clone())
|
||||
} else {
|
||||
v.clone()
|
||||
})
|
||||
}).collect());
|
||||
let map = Rc::new(
|
||||
new.as_inner()
|
||||
.iter()
|
||||
.map(|(&k, v)| {
|
||||
(
|
||||
k,
|
||||
if let Value::Builtins = v {
|
||||
Value::AttrSet(new.clone())
|
||||
} else {
|
||||
v.clone()
|
||||
},
|
||||
)
|
||||
})
|
||||
.collect(),
|
||||
);
|
||||
let last = Some(
|
||||
Env {
|
||||
last: self.last.clone(),
|
||||
|
||||
Reference in New Issue
Block a user