Skip to content

Commit 7e80018

Browse files
committed
compat: use simlin_core imports instead of simlin_engine re-exports
The core types (Error, ErrorCode, ErrorKind, Result, Ident, Canonical) have already been moved to simlin_core and are re-exported from simlin_engine::common. This change updates simlin-compat to import these types directly from simlin_core, reducing coupling between simlin-compat and simlin-engine.
1 parent a52ec64 commit 7e80018

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

src/simlin-compat/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pub fn to_xmile(project: &Project) -> Result<String> {
3838

3939
#[cfg(feature = "vensim")]
4040
pub fn open_vensim(reader: &mut dyn BufRead) -> Result<Project> {
41-
use simlin_engine::common::{Error, ErrorCode, ErrorKind};
41+
use simlin_core::common::{Error, ErrorCode, ErrorKind};
4242
use xmutil::convert_vensim_mdl;
4343

4444
let mut contents_buf: Vec<u8> = vec![];

src/simlin-compat/tests/roundtrip.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ fn roundtrips_model() {
6868
}
6969
}
7070

71-
assert!(project.models.contains_key(&simlin_engine::common::Ident::<
72-
simlin_engine::common::Canonical,
71+
assert!(project.models.contains_key(&simlin_core::common::Ident::<
72+
simlin_core::common::Canonical,
7373
>::from_raw("main")));
7474
}
7575
}

src/simlin-compat/tests/simulate.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use std::rc::Rc;
1010
use float_cmp::approx_eq;
1111

1212
use simlin_compat::{load_csv, load_dat, xmile};
13-
use simlin_engine::common::{Canonical, Ident};
13+
use simlin_core::common::{Canonical, Ident};
1414
use simlin_engine::interpreter::Simulation;
1515
use simlin_engine::serde::{deserialize, serialize};
1616
use simlin_engine::{Project, Results, Vm, project_io};

src/simlin-compat/tests/simulate_ltm.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use std::rc::Rc;
1010
use std::result::Result as StdResult;
1111

1212
use simlin_compat::xmile;
13-
use simlin_engine::common::{Canonical, Ident, canonicalize};
13+
use simlin_core::common::{Canonical, Ident, canonicalize};
1414
use simlin_engine::interpreter::Simulation;
1515
use simlin_engine::{Project, Results, Vm, ltm};
1616

0 commit comments

Comments
 (0)