Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/ast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1754,7 +1754,8 @@ mod alias_scope_regression_tests {
use crate::error::ErrorCollector;

fn analyze_multifile(files: Vec<(&str, &str)>) -> Result<(), String> {
let (graph, _ids, _dir) = setup_graph(files);
let (graph, _ids, _dir) =
setup_graph(files, [crate::unstable::UnstableFeature::UseKeyword]);

let mut error_handler = ErrorCollector::new();
let driver_program = graph
Expand Down
73 changes: 51 additions & 22 deletions src/driver/linearization.rs
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,23 @@ impl fmt::Display for LinearizationError {
#[cfg(test)]
mod tests {
use crate::driver::tests::setup_graph;
use crate::unstable::UnstableFeature;

use super::*;

#[test]
fn test_linearize_simple_import() {
let (graph, ids, _dir) = setup_graph(vec![
("main.simf", "use lib::math::some_func;"),
("libs/lib/math.simf", ""),
]);
let (graph, ids, _dir) = setup_graph(
vec![
("main.simf", "use lib::math::some_func;"),
("libs/lib/math.simf", ""),
],
[
UnstableFeature::UseKeyword,
UnstableFeature::CrateKeyword,
UnstableFeature::AsKeyword,
],
);

let order = graph.linearize().unwrap();

Expand All @@ -114,12 +122,19 @@ mod tests {
// B -> imports Common
// Expected: Common loaded ONLY ONCE.

let (graph, ids, _dir) = setup_graph(vec![
("main.simf", "use lib::A::foo; use lib::B::bar;"),
("libs/lib/A.simf", "use crate::Common::dummy1;"),
("libs/lib/B.simf", "use crate::Common::dummy2;"),
("libs/lib/Common.simf", ""),
]);
let (graph, ids, _dir) = setup_graph(
vec![
("main.simf", "use lib::A::foo; use lib::B::bar;"),
("libs/lib/A.simf", "use crate::Common::dummy1;"),
("libs/lib/B.simf", "use crate::Common::dummy2;"),
("libs/lib/Common.simf", ""),
],
[
UnstableFeature::UseKeyword,
UnstableFeature::CrateKeyword,
UnstableFeature::AsKeyword,
],
);

let order = graph.linearize().unwrap();

Expand All @@ -137,11 +152,18 @@ mod tests {

#[test]
fn test_linearize_detects_cycle() {
let (graph, _, _dir) = setup_graph(vec![
("main.simf", "use lib::A::entry;"),
("libs/lib/A.simf", "use crate::B::func;"),
("libs/lib/B.simf", "use crate::A::func;"),
]);
let (graph, _, _dir) = setup_graph(
vec![
("main.simf", "use lib::A::entry;"),
("libs/lib/A.simf", "use crate::B::func;"),
("libs/lib/B.simf", "use crate::A::func;"),
],
[
UnstableFeature::UseKeyword,
UnstableFeature::CrateKeyword,
UnstableFeature::AsKeyword,
],
);

let order = graph.linearize();
assert!(matches!(
Expand All @@ -154,13 +176,20 @@ mod tests {
fn test_linearize_allows_conflicting_nested_import_order() {
// A imports X then Y, while B imports Y then X.
// This DAG is still valid because neither X nor Y depends on the other.
let (graph, ids, _dir) = setup_graph(vec![
("main.simf", "use lib::A::foo; use lib::B::bar;"),
("libs/lib/A.simf", "use crate::X::foo; use crate::Y::bar;"),
("libs/lib/B.simf", "use crate::Y::baz; use crate::X::qux;"),
("libs/lib/X.simf", ""),
("libs/lib/Y.simf", ""),
]);
let (graph, ids, _dir) = setup_graph(
vec![
("main.simf", "use lib::A::foo; use lib::B::bar;"),
("libs/lib/A.simf", "use crate::X::foo; use crate::Y::bar;"),
("libs/lib/B.simf", "use crate::Y::baz; use crate::X::qux;"),
("libs/lib/X.simf", ""),
("libs/lib/Y.simf", ""),
],
[
UnstableFeature::UseKeyword,
UnstableFeature::CrateKeyword,
UnstableFeature::AsKeyword,
],
);

let order = graph
.linearize()
Expand Down
Loading
Loading