sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-05 12:56:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

lang/rust-nightly: update to 1.33.0.20190105

Browse source 
Changes:	ec194646fe...f381a96255
This commit is contained in:
Jan Beich 2019-01-05 00:37:40 +00:00
parent 77de24b55e
commit fc076f39be
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=489283
3 changed files with 9 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lang/rust-nightly/Makefile
View file

@ -5,6 +5,9 @@ PORTVERSION= 1.33.0.${NIGHTLY_DATE:C,-,,g}
PKGNAMESUFFIX= -nightly
DISTNAME= rustc-nightly-src
PATCH_SITES= https://github.com/rust-lang/${PORTNAME}/commit/
PATCHFILES= 49337938cb78.patch:-p1
MASTERDIR= ${.CURDIR}/../rust
PATCHDIR= ${.CURDIR}/files
DISTINFO_FILE= ${.CURDIR}/distinfo
@ -14,7 +17,7 @@ CONFLICTS_INSTALL= rust
# Which source to pull:
# https://static.rust-lang.org/dist/${NIGHTLY_DATE}/rustc-nightly-src.tar.gz
# https://static.rust-lang.org/dist/channel-rust-nightly.toml
NIGHTLY_DATE= 2019-01-03
NIGHTLY_DATE= 2019-01-05
NIGHTLY_SUBDIR= ${NIGHTLY_DATE}/
# See WRKSRC/src/stage0.txt for this date

8
lang/rust-nightly/distinfo
View file

@ -1,6 +1,8 @@
TIMESTAMP = 1546448030
SHA256 (rust/2019-01-03/rustc-nightly-src.tar.xz) = 5ff712be6e2a80a3aa945e9c6df28b074aee767120339de15ecd72cfbf0e46fa
SIZE (rust/2019-01-03/rustc-nightly-src.tar.xz) = 100414384
TIMESTAMP = 1546637171
SHA256 (rust/2019-01-05/rustc-nightly-src.tar.xz) = a76ee4bfc025f644f2841c42e991093dadb396a2fc0a7634143a7e82857b4914
SIZE (rust/2019-01-05/rustc-nightly-src.tar.xz) = 100443520
SHA256 (rust/49337938cb78.patch) = 552865e9c3d0d8970dd515351ad8d23a77cf640365e4b83e9b4080a8fd9118d9
SIZE (rust/49337938cb78.patch) = 10802
SHA256 (rust/2018-12-09/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 1c59a13cc385c9e06b80202651f8af9e9e22658e1863de85ce67ca12a0940a46
SIZE (rust/2018-12-09/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 70377440
SHA256 (rust/2018-12-09/rust-std-beta-x86_64-unknown-freebsd.tar.gz) = 12fa39ff525ddd64490e63be98b954c9ee66e0cf603143f49b04f1c5760f3885

28
lang/rust-nightly/files/patch-rls-nightly
View file

@ -1,28 +0,0 @@
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<O: Output> LsService<O> {
}
}
- 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<O: Output> LsService<O> {
}
}
- 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 };
}