From owner-dev-commits-ports-main@freebsd.org Sun Jun 20 09:30:43 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3806C64C60C; Sun, 20 Jun 2021 09:30:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4G76pV57X2z4jk6; Sun, 20 Jun 2021 09:30:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8BE70270C3; Sun, 20 Jun 2021 09:30:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15K9Uge9037293; Sun, 20 Jun 2021 09:30:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15K9UgCR037292; Sun, 20 Jun 2021 09:30:42 GMT (envelope-from git) Date: Sun, 20 Jun 2021 09:30:42 GMT Message-Id: <202106200930.15K9UgCR037292@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tobias Kortkamp Subject: git: d6a24d4f9c7f - main - net-p2p/openethereum: Unbreak with Rust 1.53.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tobik X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d6a24d4f9c7f620336e35324eab5bce776cf14e7 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jun 2021 09:30:43 -0000 The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=d6a24d4f9c7f620336e35324eab5bce776cf14e7 commit d6a24d4f9c7f620336e35324eab5bce776cf14e7 Author: Tobias Kortkamp AuthorDate: 2021-06-19 19:34:01 +0000 Commit: Tobias Kortkamp CommitDate: 2021-06-20 09:26:08 +0000 net-p2p/openethereum: Unbreak with Rust 1.53.0 error[E0061]: this function takes 1 argument but 2 arguments were supplied --> cargo-crates/logos-derive-0.7.7/src/lib.rs:55:20 | 55 | extras.insert(util::ident(&ext), |_| panic!("Only one #[extras] attribute can be declared.")); | ^^^^^^ ----------------- ----------------------------------------------------------- supplied 2 arguments | | | expected 1 argument | http://package23.nyi.freebsd.org/data/114i386-default-foo/2021-06-18_08h49m22s/logs/errors/openethereum-3.2.6.log PR: 256653 --- ...atch-cargo-crates_logos-derive-0.7.7_src_lib.rs | 34 ++++++++++++++++++++++ ...tch-cargo-crates_logos-derive-0.7.7_src_util.rs | 16 ++++++++++ 2 files changed, 50 insertions(+) diff --git a/net-p2p/openethereum/files/patch-cargo-crates_logos-derive-0.7.7_src_lib.rs b/net-p2p/openethereum/files/patch-cargo-crates_logos-derive-0.7.7_src_lib.rs new file mode 100644 index 000000000000..e522c239ff92 --- /dev/null +++ b/net-p2p/openethereum/files/patch-cargo-crates_logos-derive-0.7.7_src_lib.rs @@ -0,0 +1,34 @@ +error[E0061]: this function takes 1 argument but 2 arguments were supplied + --> cargo-crates/logos-derive-0.7.7/src/lib.rs:55:20 + | +55 | extras.insert(util::ident(&ext), |_| panic!("Only one #[extras] attribute can be declared.")); + | ^^^^^^ ----------------- ----------------------------------------------------------- supplied 2 arguments + | | + | expected 1 argument + | + +--- cargo-crates/logos-derive-0.7.7/src/lib.rs.orig 2021-06-19 19:31:53 UTC ++++ cargo-crates/logos-derive-0.7.7/src/lib.rs +@@ -52,7 +52,7 @@ pub fn logos(input: TokenStream) -> TokenStream { + + for attr in &item.attrs { + if let Some(ext) = value_from_attr("extras", attr) { +- extras.insert(util::ident(&ext), |_| panic!("Only one #[extras] attribute can be declared.")); ++ extras.insert_or(util::ident(&ext), |_| panic!("Only one #[extras] attribute can be declared.")); + } + } + +@@ -86,11 +86,11 @@ pub fn logos(input: TokenStream) -> TokenStream { + let variant = &variant.ident; + + if ident == "error" { +- error.insert(variant, |_| panic!("Only one #[error] variant can be declared.")); ++ error.insert_or(variant, |_| panic!("Only one #[error] variant can be declared.")); + } + + if ident == "end" { +- end.insert(variant, |_| panic!("Only one #[end] variant can be declared.")); ++ end.insert_or(variant, |_| panic!("Only one #[end] variant can be declared.")); + } + + if let Some(path) = value_from_attr("token", attr) { diff --git a/net-p2p/openethereum/files/patch-cargo-crates_logos-derive-0.7.7_src_util.rs b/net-p2p/openethereum/files/patch-cargo-crates_logos-derive-0.7.7_src_util.rs new file mode 100644 index 000000000000..b39df6a643c5 --- /dev/null +++ b/net-p2p/openethereum/files/patch-cargo-crates_logos-derive-0.7.7_src_util.rs @@ -0,0 +1,16 @@ +--- cargo-crates/logos-derive-0.7.7/src/util.rs.orig 2021-06-19 20:26:00 UTC ++++ cargo-crates/logos-derive-0.7.7/src/util.rs +@@ -3,11 +3,11 @@ pub use proc_macro2::{Span, TokenTree}; + use quote::quote; + + pub trait OptionExt { +- fn insert(&mut self, val: T, f: impl FnOnce(&T)); ++ fn insert_or(&mut self, val: T, f: impl FnOnce(&T)); + } + + impl OptionExt for Option { +- fn insert(&mut self, val: T, f: impl FnOnce(&T)) { ++ fn insert_or(&mut self, val: T, f: impl FnOnce(&T)) { + match self { + Some(t) => f(t), + slot => *slot = Some(val),