From owner-svn-ports-head@freebsd.org Thu Jan 3 03:49:58 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4CC78143CCD6; Thu, 3 Jan 2019 03:49:58 +0000 (UTC) (envelope-from jbeich@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E3737874BB; Thu, 3 Jan 2019 03:49:57 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D05F11B957; Thu, 3 Jan 2019 03:49:57 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x033nvpS039803; Thu, 3 Jan 2019 03:49:57 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x033nvZH039802; Thu, 3 Jan 2019 03:49:57 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201901030349.x033nvZH039802@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 3 Jan 2019 03:49:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r489131 - head/lang/rust-nightly/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/lang/rust-nightly/files X-SVN-Commit-Revision: 489131 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E3737874BB X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.969,0]; NEURAL_HAM_LONG(-1.00)[-0.998,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jan 2019 03:49:58 -0000 Author: jbeich Date: Thu Jan 3 03:49:57 2019 New Revision: 489131 URL: https://svnweb.freebsd.org/changeset/ports/489131 Log: lang/rust-nightly: unbreak after r489123 error[E0621]: explicit lifetime required in the type of `msg` --> src/tools/rls/src/server/mod.rs:185:21 | 173 | fn dispatch_message(&mut self, msg: &RawMessage) -> Result<(), jsonrpc::Error> { | ----------- help: add explicit lifetime `'static` to the type of `msg`: `&'static server::message::RawMessage` ... 185 | <$n_action as LSPNotification>::METHOD => { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lifetime `'static` required ... 259 | / match_action!( 260 | | msg.method; 261 | | notifications: 262 | | notifications::Initialized, ... | 287 | | requests::CodeLensRequest; 288 | | ); | |__________- in this macro invocation Added: head/lang/rust-nightly/files/patch-rls-nightly (contents, props changed) Added: head/lang/rust-nightly/files/patch-rls-nightly ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/rust-nightly/files/patch-rls-nightly Thu Jan 3 03:49:57 2019 (r489131) @@ -0,0 +1,28 @@ +https://github.com/rust-lang/rls/commit/085e9266e333 + +--- src/tools/rls/src/server/mod.rs.orig 2019-01-02 15:11:46 UTC ++++ src/tools/rls/src/server/mod.rs +@@ -170,7 +170,7 @@ impl LsService { + } + } + +- fn dispatch_message(&mut self, msg: &RawMessage) -> Result<(), jsonrpc::Error> { ++ fn dispatch_message(&mut self, msg: RawMessage) -> Result<(), jsonrpc::Error> { + macro_rules! match_action { + ( + $method: expr; +@@ -334,9 +334,12 @@ impl LsService { + } + } + +- if let Err(e) = self.dispatch_message(&raw_message) { ++ // Workaround https://github.com/rust-lang/rust/pull/55937 by moving ++ // raw_message instead of borrowing. ++ let id = raw_message.id.clone(); ++ if let Err(e) = self.dispatch_message(raw_message) { + error!("dispatch error: {:?}, message: `{}`", e, msg_string); +- self.output.failure(raw_message.id, e); ++ self.output.failure(id, e); + return ServerStateChange::Break { exit_code: 101 }; + } +