Skip to content

Commit 98d4460

Browse files
authored
Fix warnings in Elixir 1.20 and require Elixir 1.15 (#474)
1 parent 2245192 commit 98d4460

File tree

9 files changed

+9
-14
lines changed

9 files changed

+9
-14
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
elixir: "1.18"
2525
# Oldest version. We technically support OTP 23 but hard to test in CI
2626
- erlang: "24.3"
27-
elixir: "1.14"
27+
elixir: "1.15"
2828

2929
env:
3030
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

lib/mint/core/transport/ssl.ex

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
defmodule Mint.Core.Transport.SSL do
22
@moduledoc false
33

4-
require Logger
54
require Record
65

76
@behaviour Mint.Core.Transport

lib/mint/http1.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -762,7 +762,7 @@ defmodule Mint.HTTP1 do
762762
{:ok, conn, responses}
763763

764764
length <= byte_size(data) ->
765-
<<body::binary-size(length), rest::binary>> = data
765+
<<body::binary-size(^length), rest::binary>> = data
766766
{conn, responses} = add_body(conn, body, responses)
767767
conn = request_done(conn)
768768
responses = [{:done, request_ref} | responses]
@@ -836,7 +836,7 @@ defmodule Mint.HTTP1 do
836836
{:ok, conn, responses}
837837

838838
length <= byte_size(data) ->
839-
<<body::binary-size(length), rest::binary>> = data
839+
<<body::binary-size(^length), rest::binary>> = data
840840
{conn, responses} = add_body(conn, body, responses)
841841
conn = put_in(conn.request.body, {:chunked, :crlf})
842842
decode_body({:chunked, :crlf}, conn, rest, request_ref, responses)

lib/mint/http2.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1266,7 +1266,7 @@ defmodule Mint.HTTP2 do
12661266
end
12671267

12681268
defp split_payload_in_chunks(binary, chunk_size, acc) do
1269-
<<chunk::size(chunk_size)-binary, rest::binary>> = binary
1269+
<<chunk::size(^chunk_size)-binary, rest::binary>> = binary
12701270
split_payload_in_chunks(rest, chunk_size, [chunk | acc])
12711271
end
12721272

lib/mint/http2/frame.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ defmodule Mint.HTTP2.Frame do
271271
else
272272
# 1 byte is for the space taken by pad_length
273273
data_length = byte_size(payload) - pad_length - 1
274-
<<data::size(data_length)-binary, padding::size(pad_length)-binary>> = rest
274+
<<data::size(^data_length)-binary, padding::size(^pad_length)-binary>> = rest
275275
{data, padding}
276276
end
277277
end

mix.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ defmodule Mint.MixProject do
88
[
99
app: :mint,
1010
version: @version,
11-
elixir: "~> 1.14",
11+
elixir: "~> 1.15",
1212
start_permanent: Mix.env() == :prod,
1313
elixirc_paths: elixirc_paths(Mix.env()),
1414
deps: deps(),

test/mint/http1/conn_properties_test.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ defmodule Mint.HTTP1.PropertiesTest do
9090
|> Enum.sort()
9191
|> Enum.reduce({[], binary, 0}, fn split, {chunks, rest, prev_split} ->
9292
length = split - prev_split
93-
<<chunk::binary-size(length), rest::binary>> = rest
93+
<<chunk::binary-size(^length), rest::binary>> = rest
9494
{[chunk | chunks], rest, split}
9595
end)
9696
|> join_last_chunk()

test/mint/http2/integration_test.exs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,9 @@ defmodule HTTP2.IntegrationTest do
3737

3838
assert {:ok, %HTTP2{} = conn, ref} = HTTP2.request(conn, "GET", "/httpbin/", [], nil)
3939

40-
# For some reason, on OTP 26+ we get an SSL message sneaking in here. Instead of going
40+
# For some reason, we get an SSL message sneaking in here. Instead of going
4141
# crazy trying to debug it, for now let's just swallow it.
42-
if System.otp_release() >= "26" do
43-
assert_receive {:ssl, _socket, _data}, 1000
44-
end
42+
assert_receive {:ssl, _socket, _data}, 1000
4543

4644
assert {:ok, %HTTP2{} = conn, responses} = receive_stream(conn)
4745

test/mint/unix_socket_test.exs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ defmodule Mint.UnixSocketTest do
33

44
alias Mint.{HTTP, TestSocketServer}
55

6-
require HTTP
7-
86
unix? = match?({:unix, _}, :os.type())
97
otp_19? = System.otp_release() >= "19"
108
@moduletag skip: not (unix? and otp_19?)

0 commit comments

Comments
 (0)