Skip to content

Commit f7b6a5e

Browse files
committed
Revert "all: fix 3 more tests"
This reverts commit 4d61443.
1 parent 4d61443 commit f7b6a5e

4 files changed

Lines changed: 5 additions & 8 deletions

File tree

‎vlib/builtin/chan_option_result.v‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@ pub fn (err IError) str() string {
5959
if err is None__ {
6060
return 'none'
6161
}
62-
if err.code() > 0 {
63-
return '${err.msg()}; code: ${err.code()}'
64-
}
6562
return err.msg()
6663
}
6764

‎vlib/v/gen/c/cgen.v‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4403,7 +4403,7 @@ fn (mut g Gen) typeof_expr(node ast.TypeOf) {
44034403
if sym.kind == .sum_type {
44044404
// When encountering a .sum_type, typeof() should be done at runtime,
44054405
// because the subtype of the expression may change:
4406-
g.write('charptr__vstring_literal(v_typeof_sumtype_${sym.cname}( (')
4406+
g.write('builtin__charptr_vstring_literal(v_typeof_sumtype_${sym.cname}( (')
44074407
if typ.nr_muls() > 0 {
44084408
g.write('*'.repeat(typ.nr_muls()))
44094409
}

‎vlib/v/gen/c/fn.v‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1692,7 +1692,7 @@ fn (mut g Gen) method_call(node ast.CallExpr) {
16921692
match node.kind {
16931693
.type_name {
16941694
if left_sym.kind in [.sum_type, .interface] {
1695-
g.conversion_function_call('charptr__vstring_literal(v_typeof_${prefix_name}_${typ_sym.cname}',
1695+
g.conversion_function_call('builtin__charptr_vstring_literal(v_typeof_${prefix_name}_${typ_sym.cname}',
16961696
')', node)
16971697
return
16981698
}

‎vlib/v/pref/default.v‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,9 @@ fn (mut p Preferences) find_cc_if_cross_compiling() {
242242
return
243243
}
244244
if p.ccompiler_set_by_flag {
245-
// tcc cannot cross-compile for Windows (no Windows headers),
246-
// so override it with the proper cross-compiler.
247-
if p.os == .windows && p.ccompiler.contains('tcc') {
245+
// Only mingw compilers can cross-compile for Windows (others lack Windows headers),
246+
// so override any non-mingw compiler with the proper cross-compiler.
247+
if p.os == .windows && !p.ccompiler.contains('mingw') {
248248
p.ccompiler = p.vcross_compiler_name()
249249
return
250250
}

0 commit comments

Comments
 (0)