diff options
| author | gingerBill <bill@gingerbill.org> | 2024-04-10 12:32:32 +0100 |
|---|---|---|
| committer | gingerBill <bill@gingerbill.org> | 2024-04-10 12:32:32 +0100 |
| commit | 97e2d8916a2b5018cdee15c5057edbbdcb9128d5 (patch) | |
| tree | acadc8e0407447a50e9aa0a14429de15917a631e /src | |
| parent | 3dfd61dd4f1aec7525a8d6820c9c977f6a3ed14e (diff) | |
| parent | 0f39b9ef22c4b73448bc0ccc58369ea36723103e (diff) | |
Merge branch 'master' of https://github.com/odin-lang/Odin
Diffstat (limited to 'src')
| -rw-r--r-- | src/check_type.cpp | 2 | ||||
| -rw-r--r-- | src/linker.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/check_type.cpp b/src/check_type.cpp index 81e67f261..f1d991acb 100644 --- a/src/check_type.cpp +++ b/src/check_type.cpp @@ -1689,7 +1689,7 @@ gb_internal Type *check_get_params(CheckerContext *ctx, Scope *scope, Ast *_para bool is_using = (p->flags&FieldFlag_using) != 0; if ((check_vet_flags(param) & VetFlag_UsingParam) && is_using) { ERROR_BLOCK(); - error(param, "'using' on a procedure parameter is now allowed when '-vet' or '-vet-using-param' is applied"); + error(param, "'using' on a procedure parameter is not allowed when '-vet' or '-vet-using-param' is applied"); error_line("\t'using' is considered bad practice to use as a statement/procedure parameter outside of immediate refactoring\n"); } diff --git a/src/linker.cpp b/src/linker.cpp index aa36b3278..498a96c5f 100644 --- a/src/linker.cpp +++ b/src/linker.cpp @@ -384,7 +384,7 @@ gb_internal i32 linker_stage(LinkerData *gen) { LIT(obj_file), LIT(build_context.extra_assembler_flags) ); - if (!result) { + if (result) { gb_printf_err("executing `nasm` to assemble foreing import of %.*s failed.\n\tSuggestion: `nasm` does not ship with the compiler and should be installed with your system's package manager.\n", LIT(asm_file)); return result; } |