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

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

24
cmd/tools/vpm/parse.v
View file

@ -114,13 +114,13 @@ fn (mut p Parser) parse_module(m string) {
mod_path := normalize_mod_path(os.join_path(if kind == .http { publisher } else { '' },
manifest.name))
Module{
name: manifest.name
url: ident
version: version
name: manifest.name
url: ident
version: version
install_path: os.real_path(os.join_path(settings.vmodules_path, mod_path))
is_external: true
tmp_path: tmp_path
manifest: manifest
is_external: true
tmp_path: tmp_path
manifest: manifest
}
} else {
// VPM registered module.
@ -170,13 +170,13 @@ fn (mut p Parser) parse_module(m string) {
vmod.Manifest{}
}
Module{
name: info.name
url: info.url
version: version
vcs: vcs
name: info.name
url: info.url
version: version
vcs: vcs
install_path: os.real_path(os.join_path(settings.vmodules_path, mod_path))
tmp_path: tmp_path
manifest: manifest
tmp_path: tmp_path
manifest: manifest
}
}
mod.install_path_fmted = fmt_mod_path(mod.install_path)

20
cmd/tools/vpm/settings.v
View file

@ -44,16 +44,16 @@ fn init_settings() VpmSettings {
}
return VpmSettings{
is_help: '-h' in opts || '--help' in opts || 'help' in cmds
is_once: '--once' in opts
is_verbose: '-v' in opts || '--verbose' in opts
is_force: '-f' in opts || '--force' in opts
server_urls: cmdline.options(args, '--server-urls')
vcs: if '--hg' in opts { .hg } else { .git }
vmodules_path: vmodules_path
tmp_path: os.join_path(os.vtmp_dir(), 'vpm_modules')
is_help: '-h' in opts || '--help' in opts || 'help' in cmds
is_once: '--once' in opts
is_verbose: '-v' in opts || '--verbose' in opts
is_force: '-f' in opts || '--force' in opts
server_urls: cmdline.options(args, '--server-urls')
vcs: if '--hg' in opts { .hg } else { .git }
vmodules_path: vmodules_path
tmp_path: os.join_path(os.vtmp_dir(), 'vpm_modules')
no_dl_count_increment: is_ci || is_no_inc
fail_on_prompt: os.getenv('VPM_FAIL_ON_PROMPT') != ''
logger: logger
fail_on_prompt: os.getenv('VPM_FAIL_ON_PROMPT') != ''
logger: logger
}
}

20
cmd/tools/vpm/vcs.v
View file

@ -35,22 +35,22 @@ fn init_vcs_info() !map[VCS]VCSInfo {
}
return {
VCS.git: VCSInfo{
dir: '.git'
dir: '.git'
args: struct {
install: git_install_cmd
version: '--single-branch -b'
update: 'pull --recurse-submodules' // pulling with `--depth=1` leads to conflicts when the upstream has more than 1 new commits.
path: '-C'
install: git_install_cmd
version: '--single-branch -b'
update: 'pull --recurse-submodules' // pulling with `--depth=1` leads to conflicts when the upstream has more than 1 new commits.
path: '-C'
outdated: ['fetch', 'rev-parse @', 'rev-parse @{u}']
}
}
VCS.hg: VCSInfo{
dir: '.hg'
dir: '.hg'
args: struct {
install: 'clone'
version: '--rev'
update: 'pull --update'
path: '-R'
install: 'clone'
version: '--rev'
update: 'pull --update'
path: '-R'
outdated: ['incoming']
}
}