Skip to content
Merged
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
7 changes: 3 additions & 4 deletions src/ast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1442,10 +1442,9 @@ fn analyze_named_module(
ModuleItem::Module(module) if module.name == name => Some(module),
_ => None,
});
let witness_module = iter
.next()
.ok_or(Error::ModuleRequired(name.shallow_clone()))
.with_span(from)?;
let Some(witness_module) = iter.next() else {
return Ok(HashMap::new()); // "not present" is equivalent to empty
};
if iter.next().is_some() {
return Err(Error::ModuleRedefined(name)).with_span(from);
}
Expand Down
5 changes: 0 additions & 5 deletions src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,6 @@ pub enum Error {
WitnessTypeMismatch(WitnessName, ResolvedType, ResolvedType),
WitnessReassigned(WitnessName),
WitnessOutsideMain,
ModuleRequired(ModuleName),
ModuleRedefined(ModuleName),
ArgumentMissing(WitnessName),
ArgumentTypeMismatch(WitnessName, ResolvedType, ResolvedType),
Expand Down Expand Up @@ -465,10 +464,6 @@ impl fmt::Display for Error {
f,
"Witness expressions are not allowed outside the `main` function"
),
Error::ModuleRequired(name) => write!(
f,
"Required module `{name}` is missing"
),
Error::ModuleRedefined(name) => write!(
f,
"Module `{name}` is defined twice"
Expand Down
7 changes: 5 additions & 2 deletions src/witness.rs
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,11 @@ fn main() {
#[test]
fn missing_witness_module() {
match WitnessValues::parse_from_str("") {
Ok(_) => panic!("Missing witness module was falsely accepted"),
Err(error) => assert!(error.to_string().contains("module `witness` is missing")),
Ok(v) => assert!(
v.iter().next().is_none(),
"empty witness module was parsed as nonempty"
),
Err(error) => panic!("Missing witness module was falsely rejected: {error}"),
}
}

Expand Down