lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-04-10 07:45:54 -04:00
Code Issues Releases Wiki Activity

refactor: move from io/ioutil to io and os package (#1298)

Browse Source 
Author: Eng Zer Jun <engzerjun@gmail.com>
Date:   Mon Sep 27 00:56:31 2021 +0800

    refactor: move from io/ioutil to io and os package (#1298)
This commit is contained in:
Shelikhoo
2021-09-27 23:02:19 +01:00
parent be4dd56ac7
commit 0c3105691f
8 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
infra/conf/mergers/merge.go
View File

@@ -50,7 +50,7 @@ func Merge(input interface{}, m map[string]interface{}) error {
}
case io.Reader:
// read to []byte incase it tries different mergers
bs, err := ioutil.ReadAll(v)
bs, err := io.ReadAll(v)
if err != nil {
return err
}

2
infra/conf/mergers/merger_base.go
View File

@@ -85,7 +85,7 @@ func loadFile(file string, target map[string]interface{}, converter func(v []byt
}
func loadReader(reader io.Reader, target map[string]interface{}, converter func(v []byte) ([]byte, error)) error {
bs, err := ioutil.ReadAll(reader)
bs, err := io.ReadAll(reader)
if err != nil {
return err
}