diff --git a/lang/rust/distinfo b/lang/rust/distinfo index e17d49f5ed70..de47734af002 100644 --- a/lang/rust/distinfo +++ b/lang/rust/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.65 2019/03/04 15:37:54 he Exp $ +$NetBSD: distinfo,v 1.66 2019/03/06 16:51:53 rin Exp $ SHA1 (rust-1.32.0-i686-apple-darwin.tar.gz) = 53b4b0c4a05a4fb3fa5f601151df166dd488f911 RMD160 (rust-1.32.0-i686-apple-darwin.tar.gz) = 91949e77519a8a1b0330d69faf06817a6d8ba856 @@ -122,6 +122,7 @@ SHA1 (patch-src_tools_cargo_tests_testsuite_build.rs) = e9185994af936e0a4f000a03 SHA1 (patch-src_tools_rls_src_cmd.rs) = 754bfb8806e209cb0ef01690b48bf4b145017ab9 SHA1 (patch-src_tools_rls_src_server_io.rs) = 74b90c1aeb70b0c3a20709145d6568ddf4647877 SHA1 (patch-src_tools_rust-installer_install-template.sh) = f2ec6dced2be1fa23773d5827503ad07d0913dc2 +SHA1 (patch-src_tools_tidy_src_features.rs) = 229be34bb91ce50ceeb69bee3833bba77600afda SHA1 (patch-vendor_backtrace-sys_src_libbacktrace_configure) = 90e54f66edce65ebe23fbf2480deb193ca926733 SHA1 (patch-vendor_libc_src_unix_solaris_mod.rs) = 1fd66c000eeae9b61e5e05c46604c574d2b2106c SHA1 (patch-vendor_rand_src_rngs_os.rs) = 7a1c6d91d9418e1f8e378c4baca33045cc768f2d diff --git a/lang/rust/patches/patch-src_tools_tidy_src_features.rs b/lang/rust/patches/patch-src_tools_tidy_src_features.rs new file mode 100644 index 000000000000..afad86dbb9c9 --- /dev/null +++ b/lang/rust/patches/patch-src_tools_tidy_src_features.rs @@ -0,0 +1,16 @@ +$NetBSD: patch-src_tools_tidy_src_features.rs,v 1.1 2019/03/06 16:51:53 rin Exp $ + +Fix build for rust 1.33.0; +trim_left_matches has been superseded by trim_start_matches. + +--- src/tools/tidy/src/features.rs.orig 2019-03-07 00:36:26.836890152 +0900 ++++ src/tools/tidy/src/features.rs 2019-03-07 00:36:45.715999809 +0900 +@@ -188,7 +188,7 @@ pub fn collect_lang_features(base_src_pa + } + + let mut parts = line.split(','); +- let level = match parts.next().map(|l| l.trim().trim_left_matches('(')) { ++ let level = match parts.next().map(|l| l.trim().trim_start_matches('(')) { + Some("active") => Status::Unstable, + Some("removed") => Status::Removed, + Some("accepted") => Status::Stable,