Skip to content

Commit

Permalink
Merge pull request #181 from robot-rover/master
Browse files Browse the repository at this point in the history
Correct typo of "might" in error messages
  • Loading branch information
kraigher authored Sep 8, 2023
2 parents 5bcf513 + 6c1ddb8 commit b4c54a5
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion vhdl_lang/src/analysis/association.rs
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ impl<'a> AnalyzeContext<'a> {
format!("Ambiguous call to function '{des}'"),
);

diagnostic.add_subprogram_candidates("migth be", candidates);
diagnostic.add_subprogram_candidates("might be", candidates);

return Err(diagnostic.into());
} else if let Some(ent) = candidates.pop() {
Expand Down
6 changes: 3 additions & 3 deletions vhdl_lang/src/analysis/expression.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1251,7 +1251,7 @@ impl Diagnostic {
Designator::OperatorSymbol(op).describe()
),
);
diag.add_subprogram_candidates("migth be", candidates);
diag.add_subprogram_candidates("might be", candidates);
diag
}
}
Expand Down Expand Up @@ -1537,11 +1537,11 @@ function \"-\"(arg : string) return integer;
Diagnostic::error(code.s1("-"), "ambiguous use of operator \"-\"")
.related(
decls.s("\"-\"", 1),
"migth be operator \"-\"[BIT_VECTOR return INTEGER]",
"might be operator \"-\"[BIT_VECTOR return INTEGER]",
)
.related(
decls.s("\"-\"", 2),
"migth be operator \"-\"[STRING return INTEGER]",
"might be operator \"-\"[STRING return INTEGER]",
),
],
);
Expand Down
10 changes: 5 additions & 5 deletions vhdl_lang/src/analysis/names.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1617,7 +1617,7 @@ impl Diagnostic {
&call_name.pos,
format!("Ambiguous call to {}", call_name.item.describe()),
);
diag.add_subprogram_candidates("Migth be", candidates);
diag.add_subprogram_candidates("Might be", candidates);
diag
}
}
Expand Down Expand Up @@ -2836,11 +2836,11 @@ type enum_t is (alpha, beta);
Diagnostic::error(code.s1("myfun"), "Ambiguous call to 'myfun'")
.related(
decl.s("myfun", 1),
"Migth be function myfun[INTEGER return INTEGER]",
"Might be function myfun[INTEGER return INTEGER]",
)
.related(
decl.s("myfun", 2),
"Migth be function myfun[CHARACTER return INTEGER]",
"Might be function myfun[CHARACTER return INTEGER]",
),
],
)
Expand Down Expand Up @@ -2875,11 +2875,11 @@ type enum_t is (alpha, beta);
Diagnostic::error(code.s1("myfun"), "Ambiguous call to 'myfun'")
.related(
decl.s("myfun", 1),
"Migth be function myfun[INTEGER return rec1_t]",
"Might be function myfun[INTEGER return rec1_t]",
)
.related(
decl.s("myfun", 2),
"Migth be function myfun[INTEGER return rec2_t]",
"Might be function myfun[INTEGER return rec2_t]",
),
],
)
Expand Down
4 changes: 2 additions & 2 deletions vhdl_lang/src/analysis/tests/typecheck_expression.rs
Original file line number Diff line number Diff line change
Expand Up @@ -392,11 +392,11 @@ constant bad: integer := fun1;
Diagnostic::error(code.s1(":= fun1").s1("fun1"), "Ambiguous call to 'fun1'")
.related(
code.s("fun1", 1),
"Migth be function fun1[NATURAL return NATURAL]",
"Might be function fun1[NATURAL return NATURAL]",
)
.related(
code.s("fun1", 2),
"Migth be function fun1[BOOLEAN return NATURAL]",
"Might be function fun1[BOOLEAN return NATURAL]",
),
],
);
Expand Down

0 comments on commit b4c54a5

Please sign in to comment.