mirrors/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-15 15:32:27 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 24

fmt: fix alignment of struct init fields (#22025)

Browse source
This commit is contained in:
yuyi 2024-08-11 14:11:24 +08:00 • committed by GitHub
parent 99da5726db
commit c51d30bf53
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
671 changed files with 18817 additions and 18787 deletions
Download patch file Download diff file Expand all files Collapse all files

72
vlib/builtin/map.v
View file

@ -92,14 +92,14 @@ mut:
fn new_dense_array(key_bytes int, value_bytes int) DenseArray {
cap := 8
return DenseArray{
key_bytes: key_bytes
key_bytes: key_bytes
value_bytes: value_bytes
cap: cap
len: 0
deletes: 0
cap: cap
len: 0
deletes: 0
all_deleted: unsafe { nil }
keys: unsafe { malloc(__at_least_one(u64(cap) * u64(key_bytes))) }
values: unsafe { malloc(__at_least_one(u64(cap) * u64(value_bytes))) }
keys: unsafe { malloc(__at_least_one(u64(cap) * u64(key_bytes))) }
values: unsafe { malloc(__at_least_one(u64(cap) * u64(value_bytes))) }
}
}
@ -252,20 +252,20 @@ fn new_map(key_bytes int, value_bytes int, hash_fn MapHashFn, key_eq_fn MapEqFn,
// for now assume anything bigger than a pointer is a string
has_string_keys := key_bytes > sizeof(voidptr)
return map{
key_bytes: key_bytes
value_bytes: value_bytes
even_index: init_even_index
key_bytes: key_bytes
value_bytes: value_bytes
even_index: init_even_index
cached_hashbits: max_cached_hashbits
shift: init_log_capicity
key_values: new_dense_array(key_bytes, value_bytes)
metas: unsafe { &u32(vcalloc_noscan(metasize)) }
extra_metas: extra_metas_inc
len: 0
shift: init_log_capicity
key_values: new_dense_array(key_bytes, value_bytes)
metas: unsafe { &u32(vcalloc_noscan(metasize)) }
extra_metas: extra_metas_inc
len: 0
has_string_keys: has_string_keys
hash_fn: hash_fn
key_eq_fn: key_eq_fn
clone_fn: clone_fn
free_fn: free_fn
hash_fn: hash_fn
key_eq_fn: key_eq_fn
clone_fn: clone_fn
free_fn: free_fn
}
}
@ -687,14 +687,14 @@ pub fn (m &map) values() array {
@[unsafe]
fn (d &DenseArray) clone() DenseArray {
res := DenseArray{
key_bytes: d.key_bytes
key_bytes: d.key_bytes
value_bytes: d.value_bytes
cap: d.cap
len: d.len
deletes: d.deletes
cap: d.cap
len: d.len
deletes: d.deletes
all_deleted: unsafe { nil }
values: unsafe { nil }
keys: unsafe { nil }
values: unsafe { nil }
keys: unsafe { nil }
}
unsafe {
if d.deletes != 0 {
@ -711,20 +711,20 @@ fn (d &DenseArray) clone() DenseArray {
pub fn (m &map) clone() map {
metasize := int(sizeof(u32) * (m.even_index + 2 + m.extra_metas))
res := map{
key_bytes: m.key_bytes
value_bytes: m.value_bytes
even_index: m.even_index
key_bytes: m.key_bytes
value_bytes: m.value_bytes
even_index: m.even_index
cached_hashbits: m.cached_hashbits
shift: m.shift
key_values: unsafe { m.key_values.clone() }
metas: unsafe { &u32(malloc_noscan(metasize)) }
extra_metas: m.extra_metas
len: m.len
shift: m.shift
key_values: unsafe { m.key_values.clone() }
metas: unsafe { &u32(malloc_noscan(metasize)) }
extra_metas: m.extra_metas
len: m.len
has_string_keys: m.has_string_keys
hash_fn: m.hash_fn
key_eq_fn: m.key_eq_fn
clone_fn: m.clone_fn
free_fn: m.free_fn
hash_fn: m.hash_fn
key_eq_fn: m.key_eq_fn
clone_fn: m.clone_fn
free_fn: m.free_fn
}
unsafe { vmemcpy(res.metas, m.metas, metasize) }
if !m.has_string_keys {