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

doc, fmt: use map{key: value} syntax for map literals (#8623)

This commit is contained in:
Nick Treleaven
2021-02-08 14:57:42 +00:00
committed by GitHub
parent 8ae23cd89e
commit 9e751f72c4
15 changed files with 81 additions and 69 deletions

View File

@ -274,25 +274,25 @@ fn test_map_assign() {
mut a := map[string]f64{}
mut b := map[string]int{}
mut c := map[string]u16{}
a = {
a = map{
'x': 12.4
'y': 3
}
b = {
b = map{
'u': -13
'v': 12
}
c = {
c = map{
's': u16(5)
't': 3
}
_ := Mstruct1{{
_ := Mstruct1{map{
'p': 12
}}
_ := Mstruct2{{
_ := Mstruct2{map{
'q': 1.7
}}
_ := Mstruct3{{
_ := Mstruct3{map{
'r': u16(6)
's': 5
}}
@ -335,7 +335,7 @@ fn test_map_in_directly() {
}
fn test_plus_assign_string() {
mut m := {
mut m := map{
'one': ''
}
m['one'] += '1'
@ -344,7 +344,7 @@ fn test_plus_assign_string() {
}
fn test_map_keys_to_array() {
m := {
m := map{
'a': 'b'
'c': 'd'
}
@ -364,7 +364,7 @@ fn map_in_mut(mut m map[string]int) {
}
fn test_map_in_mut() {
mut m := {
mut m := map{
'one': 1
}
map_in_mut(mut m)
@ -372,7 +372,7 @@ fn test_map_in_mut() {
}
fn test_map_in() {
m := {
m := map{
'Foo': 'bar'
}
if 'foo'.capitalize() in m {
@ -404,7 +404,7 @@ fn mut_map_with_relation_op_in_fn(mut m map[string]int) {
}
fn test_mut_map_with_relation_op_in_fn() {
mut m := {
mut m := map{
'one': 1
'two': 2
}
@ -418,7 +418,7 @@ fn test_mut_map_with_relation_op_in_fn() {
}
fn test_map_str_after_delete() {
mut m := {
mut m := map{
'first': 1
'second': 2
'third': 3
@ -432,7 +432,7 @@ fn test_map_str_after_delete() {
}
fn test_modify_map_value() {
mut m1 := {
mut m1 := map{
'foo': 3
'bar': -7
}
@ -443,7 +443,7 @@ fn test_modify_map_value() {
}
fn test_map_clone() {
mut nums := {
mut nums := map{
'foo': 1
'bar': 2
}
@ -470,7 +470,7 @@ fn test_map_default_zero() {
}
fn test_map_or() {
m := {
m := map{
'first': 1
'second': 2
'third': 3
@ -489,7 +489,7 @@ fn test_int_keys() {
m[5] += 24
m[5]++
assert m[5] == 25
m2 := {
m2 := map{
3: 9
4: 16
5: 25
@ -521,7 +521,7 @@ fn test_voidptr_keys() {
}
fn test_rune_keys() {
mut m := {
mut m := map{
`!`: 2
`%`: 3
}
@ -541,62 +541,62 @@ fn test_rune_keys() {
}
fn test_eq() {
a := {
a := map{
'a': 1
'b': 2
}
assert a == {
assert a == map{
'a': 1
'b': 2
}
b := {
b := map{
'a': [[1]]
'b': [[2]]
}
assert b == {
assert b == map{
'a': [[1]]
'b': [[2]]
}
c := {
'a': {
c := map{
'a': map{
'11': 1
}
'b': {
'b': map{
'22': 2
}
}
assert c == {
'a': {
assert c == map{
'a': map{
'11': 1
}
'b': {
'b': map{
'22': 2
}
}
d := {
d := map{
'a': MValue{
name: 'aa'
misc: {
misc: map{
'11': '1'
}
}
'b': MValue{
name: 'bb'
misc: {
misc: map{
'22': '2'
}
}
}
assert d == {
assert d == map{
'a': MValue{
name: 'aa'
misc: {
misc: map{
'11': '1'
}
}
'b': MValue{
name: 'bb'
misc: {
misc: map{
'22': '2'
}
}
@ -604,24 +604,24 @@ fn test_eq() {
}
fn test_non_string_key_map_str() {
assert {
assert map{
23: 4
}.str() == '{23: 4}'
assert {
assert map{
`a`: 12
`b`: 13
}.str() == '{`a`: 12, `b`: 13}'
assert {
assert map{
23: 'foo'
25: 'bar'
}.str() == "{23: 'foo', 25: 'bar'}"
}
fn test_map_assign_empty_map_init() {
mut a := {
mut a := map{
'one': 1
}
a = {}
a = map{}
println(a)
assert a == map[string]int{}
assert '$a' == '{}'