Accepting request 681589 from home:luke_nukem:branches:devel:languages:rust

- add depreciated-trim_left_matches.patch: replaces depreciated
  function call in src/tools/tidy with trim_start_matches to fix
  error when bootstrapping with system 1.33.0

OBS-URL: https://build.opensuse.org/request/show/681589
OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=197

rust.spec

@@ -97,6 +97,8 @@ Source106:      %{dl_url}/rust-%{prev_rust}-powerpc64le-unknown-linux-gnu.tar.xz
 Source107:      %{dl_url}/rust-%{prev_rust}-s390x-unknown-linux-gnu.tar.xz
 # PATCH-FIX-OPENSUSE: edit src/librustc_llvm/build.rs to ignore GCC incompatible flag
 Patch0:         ignore-Wstring-conversion.patch
+# PATCH-FIX-OPENSUSE: replace depreciated trim_left_matches with trim_start_matches
+Patch1:         depreciated-trim_left_matches.patch
 # Leap 42 to 42.3, SLE12 SP1, SP2
 %if 0%{?sle_version} >= 120000 && 0%{?sle_version} <= 120200
 # In these distros cmake is 2.x, so we need cmake3 for building llvm.
@@ -302,19 +304,6 @@ BuildArch:      noarch
 %description -n cargo-doc
 This package includes HTML documentation for Cargo.
 
-%package -n cargo-miri
-Version:        %{version}
-Release:        0
-Summary:        Interpretor for Rust MIR
-License:        MIT OR Apache-2.0
-Group:          Development/Languages/Rust
-Requires:       cargo = %{version}
-
-%description -n cargo-miri
-An interpreter for Rust's mid-level intermediate representation (MIR).
-It can run binaries and test suites of cargo projects and detect certain
-classes of undefined behavior.
-
 %prep
 %if %{with rust_bootstrap}
 %ifarch x86_64
@@ -353,6 +342,7 @@ classes of undefined behavior.
 %setup -q -n rustc-%{version}-src
 
 %patch0 -p1
+%patch1 -p1
 
 # use python3
 sed -i -e "1s|#!.*|#!%{_bindir}/python3|" x.py
@@ -514,6 +504,7 @@ rm -rf %{buildroot}%{_sysconfdir}
 %{rustlibdir}/%{rust_triple}/codegen-backends/
 %exclude %{_docdir}/%{name}/html
 %exclude %{rustlibdir}/src
+%exclude %{_bindir}/*miri
 
 %files -n rust-std-static
 %dir %{rustlibdir}
@@ -592,14 +583,4 @@ rm -rf %{buildroot}%{_sysconfdir}
 %dir %{_docdir}/cargo
 %{_docdir}/cargo/html
 
-%files -n cargo-miri
-%if 0%{?suse_version} == 1315
-%doc src/tools/miri/LICENSE-{APACHE,MIT}
-%else
-%license src/tools/miri/LICENSE-{APACHE,MIT}
-%endif
-%doc src/tools/miri/README.md
-%{_bindir}/cargo-miri
-%{_bindir}/miri
-
 %changelog