1
0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00

Revert "builder: create the binary in the current directory if -o is not provided"

This reverts commit 9ae64e7fce.
This commit is contained in:
Delyan Angelov 2021-03-23 13:27:26 +02:00
parent 9ae64e7fce
commit f2b73fe3ca
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
3 changed files with 5 additions and 20 deletions

View File

@ -12,14 +12,14 @@ vlib/v/checker/tests/in_mismatch_type.vv:13:5: error: left operand to `in` does
| ~~~~~~ | ~~~~~~
14 | println('yeah') 14 | println('yeah')
15 | } 15 | }
vlib/v/checker/tests/in_mismatch_type.vv:16:5: error: use `str.contains(substr)` instead of `substr in str` vlib/v/checker/tests/in_mismatch_type.vv:16:5: error: left operand to `in` does not match: expected `string`, not `int literal`
14 | println('yeah') 14 | println('yeah')
15 | } 15 | }
16 | if 3 in s { 16 | if 3 in s {
| ~~~~~~ | ~~~~~~
17 | println('dope') 17 | println('dope')
18 | } 18 | }
vlib/v/checker/tests/in_mismatch_type.vv:19:5: error: use `str.contains(substr)` instead of `substr in str` vlib/v/checker/tests/in_mismatch_type.vv:19:5: error: left operand to `in` does not match: expected `string`, not `rune`
17 | println('dope') 17 | println('dope')
18 | } 18 | }
19 | if `a` in s { 19 | if `a` in s {

View File

@ -46,10 +46,8 @@ pub fn (mut p Preferences) fill_with_defaults() {
// The file name is just `.v` or `.vsh` or `.*` // The file name is just `.v` or `.vsh` or `.*`
base = filename base = filename
} }
// target_dir := if os.is_dir(rpath) { rpath } else { os.dir(rpath) } target_dir := if os.is_dir(rpath) { rpath } else { os.dir(rpath) }
// If no "-o" was supplied, create the binary in the current p.out_name = os.join_path(target_dir, base)
// directory. This is the behavior of Go, Clang, GCC, etc.
p.out_name = os.join_path(os.getwd(), base)
if rpath == '$p.vroot/cmd/v' && os.is_dir('vlib/compiler') { if rpath == '$p.vroot/cmd/v' && os.is_dir('vlib/compiler') {
// Building V? Use v2, since we can't overwrite a running // Building V? Use v2, since we can't overwrite a running
// executable on Windows + the precompiled V is more // executable on Windows + the precompiled V is more

View File

@ -348,18 +348,6 @@ fn return_sb_str() string {
return sb.str() // sb should be freed, but only after .str() is called return sb.str() // sb should be freed, but only after .str() is called
} }
fn parse_header0(s string) ?string {
if !s.contains(':') {
return error('missing colon in header')
}
words := s.split_nth(':', 2)
return words[0]
}
fn advanced_optionals() {
s := parse_header0('foo:bar') or { return }
}
fn main() { fn main() {
println('start') println('start')
simple() simple()
@ -386,7 +374,6 @@ fn main() {
s2 := return_sb_str() s2 := return_sb_str()
// free_map() // free_map()
// loop_map() // loop_map()
// advanced_optionals()
free_array_except_returned_element() free_array_except_returned_element()
println('end') println('end')
} }