beta test

0001-Ensure-libraries-built-in-stage0-have-unique-metadat.patch

@@ -1,40 +0,0 @@
-From e8e5eb58c0d6890f73ea01354e18f51b1a6697f8 Mon Sep 17 00:00:00 2001
-From: Josh Stone <jistone@redhat.com>
-Date: Tue, 15 May 2018 17:48:02 -0700
-Subject: [PATCH] Ensure libraries built in stage0 have unique metadata
-
-Issue #50786 shows a case with local rebuild where the libraries built
-by stage0 had the same suffix as stage0's own, and were accidentally
-loaded by that stage0 rustc when compiling `librustc_trans`.
-
-Now we set `__CARGO_DEFAULT_LIB_METADATA` to "bootstrap" during stage0,
-rather than the release channel like usual, so the library suffix will
-always be completely distinct from the stage0 compiler.
----
- src/bootstrap/builder.rs | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
-index 17f19222e6ea..e5824010ef2c 100644
---- a/src/bootstrap/builder.rs
-+++ b/src/bootstrap/builder.rs
-@@ -592,7 +592,15 @@ impl<'a> Builder<'a> {
- 
-         // FIXME: Temporary fix for https://github.com/rust-lang/cargo/issues/3005
-         // Force cargo to output binaries with disambiguating hashes in the name
--        cargo.env("__CARGO_DEFAULT_LIB_METADATA", &self.config.channel);
-+        let metadata = if compiler.stage == 0 {
-+            // Treat stage0 like special channel, whether it's a normal prior-
-+            // release rustc or a local rebuild with the same version, so we
-+            // never mix these libraries by accident.
-+            "bootstrap"
-+        } else {
-+            &self.config.channel
-+        };
-+        cargo.env("__CARGO_DEFAULT_LIB_METADATA", &metadata);
- 
-         let stage;
-         if compiler.stage == 0 && self.local_rebuild {
--- 
-2.17.0
-

0001-Fix-new-renamed_and_removed_lints-warning-247.patch

@@ -1,70 +0,0 @@
-From ab80da4ea9ea88cdd802f80955e7382bd9368247 Mon Sep 17 00:00:00 2001
-From: Benjamin Gill <github@bgill.eu>
-Date: Sat, 16 Jun 2018 12:59:44 +0100
-Subject: [PATCH] Fix new renamed_and_removed_lints warning (#247)
-
-I've verified that this now produces no warnings with Rust 1.26.1 and
-1.28.0-nightly (c3b09c968 2018-05-27)
----
- src/error_chain.rs           | 4 ++--
- src/impl_error_chain_kind.rs | 4 ++--
- src/lib.rs                   | 1 -
- 3 files changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/src/error_chain.rs b/src/error_chain.rs
-index cbd42cd67eaf..0926c8889278 100644
---- a/src/error_chain.rs
-+++ b/src/error_chain.rs
-@@ -173,7 +173,7 @@ macro_rules! impl_error_chain_processed {
-                 self.0.description()
-             }
- 
--            #[allow(unknown_lints, unused_doc_comment)]
-+            #[allow(unknown_lints, renamed_and_removed_lints, unused_doc_comment, unused_doc_comments)]
-             fn cause(&self) -> Option<&::std::error::Error> {
-                 match self.1.next_error {
-                     Some(ref c) => Some(&**c),
-@@ -424,7 +424,7 @@ macro_rules! impl_extract_backtrace {
-     ($error_name: ident
-      $error_kind_name: ident
-      $([$link_error_path: path, $(#[$meta_links: meta])*])*) => {
--        #[allow(unknown_lints, unused_doc_comment)]
-+        #[allow(unknown_lints, renamed_and_removed_lints, unused_doc_comment, unused_doc_comments)]
-         fn extract_backtrace(e: &(::std::error::Error + Send + 'static))
-             -> Option<::std::sync::Arc<$crate::Backtrace>> {
-             if let Some(e) = e.downcast_ref::<$error_name>() {
-diff --git a/src/impl_error_chain_kind.rs b/src/impl_error_chain_kind.rs
-index d6c05c8a882b..d5e266389cd6 100644
---- a/src/impl_error_chain_kind.rs
-+++ b/src/impl_error_chain_kind.rs
-@@ -264,7 +264,7 @@ macro_rules! impl_error_chain_kind {
-             $item:ident: $imode:tt [$(#[$imeta:meta])*] [$( $var:ident: $typ:ty ),*] {$( $funcs:tt )*}
-         )*}
-     ) => {
--        #[allow(unknown_lints, unused, unused_doc_comment)]
-+        #[allow(unknown_lints, unused, renamed_and_removed_lints, unused_doc_comment, unused_doc_comments)]
-         impl ::std::fmt::Display for $name {
-             fn fmt(&self, fmt: &mut ::std::fmt::Formatter)
-                 -> ::std::fmt::Result
-@@ -316,7 +316,7 @@ macro_rules! impl_error_chain_kind {
-                 }
-             }
-         }*/
--        #[allow(unknown_lints, unused, unused_doc_comment)]
-+        #[allow(unknown_lints, unused, renamed_and_removed_lints, unused_doc_comment, unused_doc_comments)]
-         impl $name {
-             /// A string describing the error kind.
-             pub fn description(&self) -> &str {
-diff --git a/src/lib.rs b/src/lib.rs
-index d0881fcef1c1..6421194f8ca8 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
-@@ -1,5 +1,4 @@
- #![deny(missing_docs)]
--#![allow(unknown_lints)] // to be removed when unused_doc_comments lints is merged
- #![doc(html_root_url = "https://docs.rs/error-chain/0.11.0")]
- 
- //! A library for consistent and reliable error handling
--- 
-2.17.1
-

rust.spec

@@ -9,10 +9,10 @@
 # e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
 # or nightly wants some beta-YYYY-MM-DD
 # Note that cargo matches the program version here, not its crate version.
-%global bootstrap_rust 1.26.0
-%global bootstrap_cargo 1.26.0
+%global bootstrap_rust 1.27.0
+%global bootstrap_cargo 1.27.0
 %global bootstrap_channel %{bootstrap_rust}
-%global bootstrap_date 2018-05-10
+%global bootstrap_date 2018-06-21
 
 # Only the specified arches will use bootstrap binaries.
 #global bootstrap_arches %%{rust_arches}
@@ -49,14 +49,14 @@
 # Some sub-packages are versioned independently of the rust compiler and runtime itself.
 # Also beware that if any of these are not changed in a version bump, then the release
 # number should still increase, not be reset to 1!
-%global rustc_version 1.27.2
-%global cargo_version 1.27.0
-%global rustfmt_version 0.6.1
-%global rls_version 0.127.0
+%global rustc_version 1.28.0
+%global cargo_version 1.28.0
+%global rustfmt_version 0.8.2
+%global rls_version 0.128.0
 
 Name:           rust
 Version:        %{rustc_version}
-Release:        4%{?dist}
+Release:        0.1.beta.14%{?dist}
 Summary:        The Rust Programming Language
 License:        (ASL 2.0 or MIT) and (BSD and MIT)
 # ^ written as: (rust itself) and (bundled libraries)
@@ -70,13 +70,6 @@ ExclusiveArch:  %{rust_arches}
 %endif
 Source0:        https://static.rust-lang.org/dist/%{rustc_package}.tar.xz
 
-# https://github.com/rust-lang/rust/pull/50789/
-Patch1:         0001-Ensure-libraries-built-in-stage0-have-unique-metadat.patch
-
-# https://github.com/rust-lang/rust/issues/51650
-# https://github.com/rust-lang-nursery/error-chain/pull/247
-Patch2:         0001-Fix-new-renamed_and_removed_lints-warning-247.patch
-
 # Get the Rust triple for any arch.
 %{lua: function rust_triple(arch)
   local abi = "gnu"
@@ -375,12 +368,6 @@ test -f '%{local_rust_root}/bin/rustc'
 
 %setup -q -n %{rustc_package}
 
-%patch1 -p1
-
-pushd src/vendor/error-chain
-%patch2 -p1
-popd
-
 %if "%{python}" == "python3"
 sed -i.try-py3 -e '/try python2.7/i try python3 "$@"' ./configure
 %endif
@@ -650,6 +637,9 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
 
 
 %changelog
+* Thu Jul 26 2018 Josh Stone <jistone@redhat.com> - 1.28.0-0.1.beta.14
+- beta test
+
 * Tue Jul 24 2018 Josh Stone <jistone@redhat.com> - 1.27.2-4
 - Update to 1.27.2.