vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

ci: fix build, remove `[manualfree]` from os.vmodules_paths for now

pull/12539/head
Delyan Angelov 2021-11-21 22:34:38 +02:00
parent 1aaac13a60
commit c7bd74e0f8
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vlib/os/os.v
View File

@ -644,27 +644,27 @@ pub fn vmodules_dir() string {
// vmodules_paths returns a list of paths, where v looks up for modules. // vmodules_paths returns a list of paths, where v looks up for modules.
// You can customize it through setting the environment variable VMODULES // You can customize it through setting the environment variable VMODULES
[manualfree] // [manualfree]
pub fn vmodules_paths() []string { pub fn vmodules_paths() []string {
mut path := getenv('VMODULES') mut path := getenv('VMODULES')
if path == '' { if path == '' {
unsafe { path.free() } // unsafe { path.free() }
path = default_vmodules_path() path = default_vmodules_path()
} }
defer { defer {
unsafe { path.free() } // unsafe { path.free() }
} }
splitted := path.split(path_delimiter) splitted := path.split(path_delimiter)
defer { defer {
unsafe { splitted.free() } // unsafe { splitted.free() }
} }
mut list := []string{cap: splitted.len} mut list := []string{cap: splitted.len}
for i in 0 .. splitted.len { for i in 0 .. splitted.len {
si := splitted[i] si := splitted[i]
trimmed := si.trim_right(path_separator) trimmed := si.trim_right(path_separator)
list << trimmed list << trimmed
unsafe { trimmed.free() } // unsafe { trimmed.free() }
unsafe { si.free() } // unsafe { si.free() }
} }
return list return list
} }

1
vlib/v/tests/valgrind/valgrind_test.v
View File

@ -29,6 +29,7 @@ const skip_valgrind_files = [
'vlib/v/tests/valgrind/fn_with_return_should_free_local_vars.v', 'vlib/v/tests/valgrind/fn_with_return_should_free_local_vars.v',
'vlib/v/tests/valgrind/option_simple.v', 'vlib/v/tests/valgrind/option_simple.v',
'vlib/v/tests/valgrind/string_plus_string_plus.v', 'vlib/v/tests/valgrind/string_plus_string_plus.v',
'vlib/v/tests/valgrind/import_os_and_use_its_constants.v',
] ]
fn vprintln(s string) { fn vprintln(s string) {