From 5f88a9146ca93c329a1b40c7bfde98c104884d4c Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Thu, 2 Feb 2023 19:44:51 +0100 Subject: [PATCH] Get rid of the latest ioutil bits --- dnscrypt-proxy/example-dnscrypt-proxy.toml | 2 +- dnscrypt-proxy/sources_test.go | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dnscrypt-proxy/example-dnscrypt-proxy.toml b/dnscrypt-proxy/example-dnscrypt-proxy.toml index 3b46a2fa..e7214f56 100644 --- a/dnscrypt-proxy/example-dnscrypt-proxy.toml +++ b/dnscrypt-proxy/example-dnscrypt-proxy.toml @@ -97,7 +97,7 @@ disabled_server_names = [] force_tcp = false -## Enable support for HTTP/3 (DoH3, HTTP over QUIC) +## Enable *experimental* support for HTTP/3 (DoH3, HTTP over QUIC) ## Note that, like DNSCrypt but unlike other HTTP versions, this uses ## UDP and (usually) port 443 instead of TCP. diff --git a/dnscrypt-proxy/sources_test.go b/dnscrypt-proxy/sources_test.go index fc604013..cd957cbd 100644 --- a/dnscrypt-proxy/sources_test.go +++ b/dnscrypt-proxy/sources_test.go @@ -3,7 +3,6 @@ package main import ( "bytes" "fmt" - "io/ioutil" "net/http" "net/http/httptest" "net/url" @@ -134,7 +133,7 @@ func loadSnakeoil(t *testing.T, d *SourceTestData) { } func loadTestSourceNames(t *testing.T, d *SourceTestData) { - files, err := ioutil.ReadDir(filepath.Join("testdata", "sources")) + files, err := os.ReadDir(filepath.Join("testdata", "sources")) if err != nil { t.Fatalf("Unable to load list of test sources: %v", err) } @@ -196,7 +195,7 @@ func loadFixtures(t *testing.T, d *SourceTestData) { } func makeTempDir(t *testing.T, d *SourceTestData) { - name, err := ioutil.TempDir("", "sources_test.go."+t.Name()) + name, err := os.MkdirTemp("", "sources_test.go."+t.Name()) if err != nil { t.Fatalf("Unable to create temporary directory: %v", err) }