Date: Tue, 17 Dec 2019 07:56:33 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r520313 - head/shells/ion Message-ID: <201912170756.xBH7uXJK063304@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Tue Dec 17 07:56:33 2019 New Revision: 520313 URL: https://svnweb.freebsd.org/changeset/ports/520313 Log: shells/ion: Unbreak build with Rust 1.40.0 (D22843) error[E0503]: cannot use `self.key_bindings` because it was mutably borrowed --> /wrkdirs/usr/ports/shells/ion/work/ion-a8872014dbce730ccd00aaa722397dc394a52bf4-a8872014dbce730ccd00aaa722397dc394a52bf4/cargo-crates/liner-0.4.4/src/context.rs:98:17 | 96 | let ed = try!(Editor::new_with_init_buffer(stdout, prompt, self, buffer)); | ---- borrow of `*self` occurs here 97 | match self.key_bindings { 98 | KeyBindings::Emacs => Self::handle_keys(keymap::Emacs::new(ed), handler), | ^^^^^^^^^^^^^^^^^^ use of borrowed `*self` 99 | KeyBindings::Vi => Self::handle_keys(keymap::Vi::new(ed), handler), | -- borrow later used here error: aborting due to previous error Modified: head/shells/ion/Makefile head/shells/ion/distinfo Modified: head/shells/ion/Makefile ============================================================================== --- head/shells/ion/Makefile Tue Dec 17 07:28:24 2019 (r520312) +++ head/shells/ion/Makefile Tue Dec 17 07:56:33 2019 (r520313) @@ -2,7 +2,7 @@ PORTNAME= ion DISTVERSION= 1.0.5-1355 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= shells PKGNAMESUFFIX= -shell @@ -118,7 +118,6 @@ CARGO_CRATES= adler32-1.0.3 \ libc-0.2.60 \ libloading-0.5.2 \ line_drawing-0.7.0 \ - liner-0.4.4 \ lock_api-0.1.5 \ log-0.4.7 \ lzw-0.10.0 \ @@ -260,6 +259,12 @@ CARGO_USE_GITLAB= yes CONFLICTS_INSTALL= ion OPTIONS_DEFINE= DOCS EXAMPLES + +# liner-0.4.4 does not build with Rust 1.40.0. Use the newer copy +# that is also already available. +post-patch: + @${REINPLACE_CMD} 's,^liner = .*,liner = \{ path = "${WRKSRC_liner}" \},' \ + ${WRKSRC_calculate}/Cargo.toml post-configure: ${ECHO_CMD} ${GL_COMMIT} > ${WRKSRC}/git_revision.txt Modified: head/shells/ion/distinfo ============================================================================== --- head/shells/ion/distinfo Tue Dec 17 07:28:24 2019 (r520312) +++ head/shells/ion/distinfo Tue Dec 17 07:56:33 2019 (r520313) @@ -1,4 +1,4 @@ -TIMESTAMP = 1565075757 +TIMESTAMP = 1576567883 SHA256 (rust/crates/adler32-1.0.3.tar.gz) = 7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c SIZE (rust/crates/adler32-1.0.3.tar.gz) = 5734 SHA256 (rust/crates/aho-corasick-0.7.4.tar.gz) = 36b7aa1ccb7d7ea3f437cf025a2ab1c47cc6c1bc9fc84918ff449def12f5e282 @@ -187,8 +187,6 @@ SHA256 (rust/crates/libloading-0.5.2.tar.gz) = f2b111a SIZE (rust/crates/libloading-0.5.2.tar.gz) = 16420 SHA256 (rust/crates/line_drawing-0.7.0.tar.gz) = 5cc7ad3d82c845bdb5dde34ffdcc7a5fb4d2996e1e1ee0f19c33bc80e15196b9 SIZE (rust/crates/line_drawing-0.7.0.tar.gz) = 10452 -SHA256 (rust/crates/liner-0.4.4.tar.gz) = e21c5e49e5d73f18124fd3c751a0823f754c5ae7193cb9e8aa467b03b161241c -SIZE (rust/crates/liner-0.4.4.tar.gz) = 29857 SHA256 (rust/crates/lock_api-0.1.5.tar.gz) = 62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c SIZE (rust/crates/lock_api-0.1.5.tar.gz) = 16967 SHA256 (rust/crates/log-0.4.7.tar.gz) = c275b6ad54070ac2d665eef9197db647b32239c9d244bfb6f041a766d00da5b3
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912170756.xBH7uXJK063304>