Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust/files/, dev-lang/rust/
Date: Fri, 18 Jun 2021 07:46:32
Message-Id: 1624002366.304df4be2f11738dcd1c9075dabf5d58002dd8e2.gyakovlev@gentoo
1 commit: 304df4be2f11738dcd1c9075dabf5d58002dd8e2
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jun 18 06:59:50 2021 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Fri Jun 18 07:46:06 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=304df4be
7
8 dev-lang/rust: refresh rustversion patch
9
10 fully bump to 1.0.5
11
12 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
13
14 ...ersion.patch => 1.53.0-rustversion-1.0.5.patch} | 229 +++++++++++++++++----
15 dev-lang/rust/rust-1.53.0.ebuild | 2 +-
16 2 files changed, 187 insertions(+), 44 deletions(-)
17
18 diff --git a/dev-lang/rust/files/1.53.0-rustversion.patch b/dev-lang/rust/files/1.53.0-rustversion-1.0.5.patch
19 similarity index 52%
20 rename from dev-lang/rust/files/1.53.0-rustversion.patch
21 rename to dev-lang/rust/files/1.53.0-rustversion-1.0.5.patch
22 index 761254ce138..bc6ae8be00b 100644
23 --- a/dev-lang/rust/files/1.53.0-rustversion.patch
24 +++ b/dev-lang/rust/files/1.53.0-rustversion-1.0.5.patch
25 @@ -1,43 +1,75 @@
26 -From b0b666350a91529caeb36e957e465eba3b6d7589 Mon Sep 17 00:00:00 2001
27 +From 12efa21eb88cb43d3b927952da0c5635373ac92b Mon Sep 17 00:00:00 2001
28 From: David Tolnay <dtolnay@×××××.com>
29 -Date: Fri, 14 May 2021 13:49:17 -0700
30 -Subject: [PATCH 1/2] Add regression test for issue 28
31 +Date: Thu, 17 Jun 2021 22:34:55 -0700
32 +Subject: [PATCH] Update rustversion to 1.0.5
33
34 ---
35 - tests/test_parse.rs | 8 ++++++++
36 - 1 file changed, 8 insertions(+)
37 + Cargo.lock | 4 +--
38 + vendor/rustversion/.cargo-checksum.json | 2 +-
39 + vendor/rustversion/Cargo.toml | 2 +-
40 + vendor/rustversion/build/build.rs | 6 ++++
41 + vendor/rustversion/build/rustc.rs | 30 +++++++++-----------
42 + vendor/rustversion/src/lib.rs | 15 ++++++++++
43 + vendor/rustversion/src/time.rs | 13 +++++++--
44 + vendor/rustversion/tests/test_parse.rs | 10 +++++++
45 + vendor/rustversion/tests/ui/bad-bound.stderr | 4 +--
46 + vendor/rustversion/tests/ui/bad-date.stderr | 4 +--
47 + 10 files changed, 63 insertions(+), 27 deletions(-)
48
49 -diff --git a/tests/test_parse.rs b/tests/test_parse.rs
50 -index a5de1aa..cb39b31 100644
51 ---- a/vendor/rustversion/tests/test_parse.rs
52 -+++ b/vendor/rustversion/tests/test_parse.rs
53 -@@ -76,6 +76,14 @@ fn test_parse() {
54 - }),
55 - },
56 - ),
57 -+ (
58 -+ "rustc 1.52.1-nightly (gentoo)",
59 -+ Version {
60 -+ minor: 52,
61 -+ patch: 1,
62 -+ channel: Dev,
63 -+ },
64 -+ ),
65 - ];
66 +diff --git a/Cargo.lock b/Cargo.lock
67 +index 0939f19cdfe..26a89caf050 100644
68 +--- a/Cargo.lock
69 ++++ b/Cargo.lock
70 +@@ -4582,9 +4582,9 @@ dependencies = [
71
72 - for (string, expected) in cases {
73 -
74 -From 2ee81bd2701915684137ae40415afa4b552af79e Mon Sep 17 00:00:00 2001
75 -From: David Tolnay <dtolnay@×××××.com>
76 -Date: Fri, 14 May 2021 13:59:44 -0700
77 -Subject: [PATCH 2/2] Parse distro nightly without a date
78 -
79 ----
80 - build/rustc.rs | 30 ++++++++++++++----------------
81 - 1 file changed, 14 insertions(+), 16 deletions(-)
82 -
83 -diff --git a/build/rustc.rs b/build/rustc.rs
84 -index 723e6bd..dfc6a05 100644
85 + [[package]]
86 + name = "rustversion"
87 +-version = "1.0.4"
88 ++version = "1.0.5"
89 + source = "registry+https://github.com/rust-lang/crates.io-index"
90 +-checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd"
91 ++checksum = "61b3909d758bb75c79f23d4736fac9433868679d3ad2ea7a61e3c25cfda9a088"
92 +
93 + [[package]]
94 + name = "ryu"
95 +diff --git a/vendor/rustversion/.cargo-checksum.json b/vendor/rustversion/.cargo-checksum.json
96 +index e1277df7b59..0a134695aaf 100644
97 +--- a/vendor/rustversion/.cargo-checksum.json
98 ++++ b/vendor/rustversion/.cargo-checksum.json
99 +@@ -1 +1 @@
100 +-{"files":{"Cargo.toml":"1a91782510461d54726e816ae776042b95c79c9949d49c11b8782caefc22ead2","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"01dc6a1bf499a12bd0bfbbfe4db2ca8460b2c151235bcf2aad2356de4c2ec50a","build/build.rs":"481daf363b7004c90ffc3e012863a4102e9f26b9aaa2a4a295c2dd78f690be28","build/rustc.rs":"4dc8f1764672137bd15758cc19242740b0d6ab99e4a69171ad0999f9112a15a6","src/attr.rs":"9301cd4aff5a9648c057d5d8de9eb66921f0c3a715c51ada4459576bd49c8b19","src/bound.rs":"44bda74d3aacfeeeac9dae2f7eef3acc844d4c3c7eaa9d3e6288e5aeff269dff","src/constfn.rs":"613b8f53b21cc06b4f619fce9000993d3e7873b650701ca01cef1e53bed5b40a","src/date.rs":"454c749a60db8144a706a813e06fe3ae39c981920ba9832ef82f3f9debe1f052","src/error.rs":"cb37102f03ebbaca313d80f9714fe08dfef92fe956789ee87d93eb6121705f4f","src/expr.rs":"8e8ca76f4f5838436d9d7273f499c698bb41f6c15bc07d32ec5c1cb8bd3dd731","sr
101 c/iter.rs":"8d4b817b9abc4e817105b673e15f29ef9bb8284a010ce01ac2d83387fe136947","src/lib.rs":"f8347832d8072058dbb4af6b8d67a834a02fe9c5460bbaa26defec4b66317f1b","src/release.rs":"abb8ddd877c39a023bf5e7bd67063d6e4144e79758a8bafa338167f9d15b89f1","src/time.rs":"45fb48ff0a0046a5a1b108b9ce53b14885637ad868ede1d66970379c2b7f16ef","src/token.rs":"824ce765f692db73afa02d3ebb0281c750748035efc98fa547be29d3072665ce","src/version.rs":"afdb048bba95bbb885945eba5527b6bf0eca0105642bfc304c2f82a8b7d556df","tests/compiletest.rs":"0a52a44786aea1c299c695bf948b2ed2081e4cc344e5c2cadceab4eb03d0010d","tests/test_const.rs":"a8297ca6559f895a3b2664964a42b6f82bbbc3c8faa9556a513006e6e1827995","tests/test_eval.rs":"6f0ee3f49c9a0d0c374a4d0e9a9dce753cd9fc2ca7725e000a435dbd5f4a9ce3","tests/test_parse.rs":"fbf9695f4208263743715e6c8b6294dfffee21462a65dfeb9339a70c0e18dbc6","tests/ui/bad-bound.rs":"25bde278fcaabf62868417148a5e5f2006bf589d7ebd7bf6004fb8d78e47594f","tests/ui/bad-bound.stderr":"bc9297f758c2541fb0a8b48d5785f4bb
102 cd0d2a07d876ba0baf2fc9de9275e7e6","tests/ui/bad-date.rs":"6e23714dae8b6346fefe50dacd4abba3265248bbadfdd60c739138aa8a0037ba","tests/ui/bad-date.stderr":"1ac3cab13ee900fc8344e8fab21ff4d9cad476aca44925a4c1b2293a6b59b742","tests/ui/bad-not.rs":"f003df8bd245e9dd8edc3a6d94078ee5162fac7a98db881271f0f5b6db98d45d","tests/ui/bad-not.stderr":"d4ef78fae4a82419e737757158796cb103a5920df498956eaf57ed201797b463","tests/ui/bad-version.rs":"f4ea2cd038e6c63deb9c2e3ceffce93dbf179d9ce18c16d88f3b6cd7138a8c8e","tests/ui/bad-version.stderr":"60ed51c62f4c2fb6ff95cff7523cfca379ed434f319da9d82704318588792338","tests/ui/const-not-fn.rs":"10bbe38f0d89391fff0698756e4cfd4e72a41090360393a0c951b67df14d1c35","tests/ui/const-not-fn.stderr":"9551f7f222445b31d7af2415d467301c332d55bb3d5a143846484f2f00047a01"},"package":"cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd"}
103 +\ No newline at end of file
104 ++{"files":{"Cargo.toml":"a09ee758f816eddff8a8c7fb5be54dd95e74caad18a207251faedd251ecfaf1c","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"01dc6a1bf499a12bd0bfbbfe4db2ca8460b2c151235bcf2aad2356de4c2ec50a","build/build.rs":"bae427f344972e6e0e348ec48dce0947274b3ec6cac0938497a8d3da5c9834e5","build/rustc.rs":"3e4acf7ea679f9331dd4e8dbe42a08a312f58379ea1eee5898793a9848d06d8c","src/attr.rs":"9301cd4aff5a9648c057d5d8de9eb66921f0c3a715c51ada4459576bd49c8b19","src/bound.rs":"44bda74d3aacfeeeac9dae2f7eef3acc844d4c3c7eaa9d3e6288e5aeff269dff","src/constfn.rs":"613b8f53b21cc06b4f619fce9000993d3e7873b650701ca01cef1e53bed5b40a","src/date.rs":"454c749a60db8144a706a813e06fe3ae39c981920ba9832ef82f3f9debe1f052","src/error.rs":"cb37102f03ebbaca313d80f9714fe08dfef92fe956789ee87d93eb6121705f4f","src/expr.rs":"8e8ca76f4f5838436d9d7273f499c698bb41f6c15bc07d32ec5c1cb8bd3dd731","sr
105 c/iter.rs":"8d4b817b9abc4e817105b673e15f29ef9bb8284a010ce01ac2d83387fe136947","src/lib.rs":"5652f6f84fc80136bd29b2125f7676e80e0df7d40aac274b0658c99cecbd871d","src/release.rs":"abb8ddd877c39a023bf5e7bd67063d6e4144e79758a8bafa338167f9d15b89f1","src/time.rs":"bdd05a743b07a6bbfa0dbc9d4e415e051aba4a51a430c3be1e23447eae298c8b","src/token.rs":"824ce765f692db73afa02d3ebb0281c750748035efc98fa547be29d3072665ce","src/version.rs":"afdb048bba95bbb885945eba5527b6bf0eca0105642bfc304c2f82a8b7d556df","tests/compiletest.rs":"0a52a44786aea1c299c695bf948b2ed2081e4cc344e5c2cadceab4eb03d0010d","tests/test_const.rs":"a8297ca6559f895a3b2664964a42b6f82bbbc3c8faa9556a513006e6e1827995","tests/test_eval.rs":"6f0ee3f49c9a0d0c374a4d0e9a9dce753cd9fc2ca7725e000a435dbd5f4a9ce3","tests/test_parse.rs":"cdfe376020b9391330292968046117b0935c828d73385e8faeb2e333ec897088","tests/ui/bad-bound.rs":"25bde278fcaabf62868417148a5e5f2006bf589d7ebd7bf6004fb8d78e47594f","tests/ui/bad-bound.stderr":"a03dc78b380191c10d3b3406b1fd3208
106 bb2609d4c26b9c33ccd335721e3cd072","tests/ui/bad-date.rs":"6e23714dae8b6346fefe50dacd4abba3265248bbadfdd60c739138aa8a0037ba","tests/ui/bad-date.stderr":"3a607fb950a69f7dc1b503295bce53541f9dee9f4674edc5d13ee3a69ff0e8cd","tests/ui/bad-not.rs":"f003df8bd245e9dd8edc3a6d94078ee5162fac7a98db881271f0f5b6db98d45d","tests/ui/bad-not.stderr":"d4ef78fae4a82419e737757158796cb103a5920df498956eaf57ed201797b463","tests/ui/bad-version.rs":"f4ea2cd038e6c63deb9c2e3ceffce93dbf179d9ce18c16d88f3b6cd7138a8c8e","tests/ui/bad-version.stderr":"60ed51c62f4c2fb6ff95cff7523cfca379ed434f319da9d82704318588792338","tests/ui/const-not-fn.rs":"10bbe38f0d89391fff0698756e4cfd4e72a41090360393a0c951b67df14d1c35","tests/ui/const-not-fn.stderr":"9551f7f222445b31d7af2415d467301c332d55bb3d5a143846484f2f00047a01"},"package":"61b3909d758bb75c79f23d4736fac9433868679d3ad2ea7a61e3c25cfda9a088"}
107 +\ No newline at end of file
108 +diff --git a/vendor/rustversion/Cargo.toml b/vendor/rustversion/Cargo.toml
109 +index 56995ff0792..c72b1b2b343 100644
110 +--- a/vendor/rustversion/Cargo.toml
111 ++++ b/vendor/rustversion/Cargo.toml
112 +@@ -13,7 +13,7 @@
113 + [package]
114 + edition = "2018"
115 + name = "rustversion"
116 +-version = "1.0.4"
117 ++version = "1.0.5"
118 + authors = ["David Tolnay <dtolnay@×××××.com>"]
119 + build = "build/build.rs"
120 + description = "Conditional compilation according to rustc compiler version"
121 +diff --git a/vendor/rustversion/build/build.rs b/vendor/rustversion/build/build.rs
122 +index 2a8bc4af39f..15312510d68 100644
123 +--- a/vendor/rustversion/build/build.rs
124 ++++ b/vendor/rustversion/build/build.rs
125 +@@ -1,3 +1,9 @@
126 ++#![allow(
127 ++ clippy::enum_glob_use,
128 ++ clippy::must_use_candidate,
129 ++ clippy::single_match_else
130 ++)]
131 ++
132 + mod rustc;
133 +
134 + use std::env;
135 +diff --git a/vendor/rustversion/build/rustc.rs b/vendor/rustversion/build/rustc.rs
136 +index 723e6bdd0e2..dfc6a05166f 100644
137 --- a/vendor/rustversion/build/rustc.rs
138 +++ b/vendor/rustversion/build/rustc.rs
139 @@ -48,23 +48,21 @@ pub fn parse(string: &str) -> Option<Version> {
140 @@ -78,14 +110,125 @@ index 723e6bd..dfc6a05 100644
141 None => Dev,
142 },
143 Some(_) => return None,
144 -diff --git a/vendor/rustversion/.cargo-checksum.json b/vendor/rustversion/.cargo-checksum.json
145 -index e1277df..2d8806a 100644
146 ---- a/vendor/rustversion/.cargo-checksum.json
147 -+++ b/vendor/rustversion/.cargo-checksum.json
148 -@@ -1 +1 @@
149 --{"files":{"Cargo.toml":"1a91782510461d54726e816ae776042b95c79c9949d49c11b8782caefc22ead2","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"01dc6a1bf499a12bd0bfbbfe4db2ca8460b2c151235bcf2aad2356de4c2ec50a","build/build.rs":"481daf363b7004c90ffc3e012863a4102e9f26b9aaa2a4a295c2dd78f690be28","build/rustc.rs":"4dc8f1764672137bd15758cc19242740b0d6ab99e4a69171ad0999f9112a15a6","src/attr.rs":"9301cd4aff5a9648c057d5d8de9eb66921f0c3a715c51ada4459576bd49c8b19","src/bound.rs":"44bda74d3aacfeeeac9dae2f7eef3acc844d4c3c7eaa9d3e6288e5aeff269dff","src/constfn.rs":"613b8f53b21cc06b4f619fce9000993d3e7873b650701ca01cef1e53bed5b40a","src/date.rs":"454c749a60db8144a706a813e06fe3ae39c981920ba9832ef82f3f9debe1f052","src/error.rs":"cb37102f03ebbaca313d80f9714fe08dfef92fe956789ee87d93eb6121705f4f","src/expr.rs":"8e8ca76f4f5838436d9d7273f499c698bb41f6c15bc07d32ec5c1cb8bd3dd731","sr
150 c/iter.rs":"8d4b817b9abc4e817105b673e15f29ef9bb8284a010ce01ac2d83387fe136947","src/lib.rs":"f8347832d8072058dbb4af6b8d67a834a02fe9c5460bbaa26defec4b66317f1b","src/release.rs":"abb8ddd877c39a023bf5e7bd67063d6e4144e79758a8bafa338167f9d15b89f1","src/time.rs":"45fb48ff0a0046a5a1b108b9ce53b14885637ad868ede1d66970379c2b7f16ef","src/token.rs":"824ce765f692db73afa02d3ebb0281c750748035efc98fa547be29d3072665ce","src/version.rs":"afdb048bba95bbb885945eba5527b6bf0eca0105642bfc304c2f82a8b7d556df","tests/compiletest.rs":"0a52a44786aea1c299c695bf948b2ed2081e4cc344e5c2cadceab4eb03d0010d","tests/test_const.rs":"a8297ca6559f895a3b2664964a42b6f82bbbc3c8faa9556a513006e6e1827995","tests/test_eval.rs":"6f0ee3f49c9a0d0c374a4d0e9a9dce753cd9fc2ca7725e000a435dbd5f4a9ce3","tests/test_parse.rs":"fbf9695f4208263743715e6c8b6294dfffee21462a65dfeb9339a70c0e18dbc6","tests/ui/bad-bound.rs":"25bde278fcaabf62868417148a5e5f2006bf589d7ebd7bf6004fb8d78e47594f","tests/ui/bad-bound.stderr":"bc9297f758c2541fb0a8b48d5785f4bb
151 cd0d2a07d876ba0baf2fc9de9275e7e6","tests/ui/bad-date.rs":"6e23714dae8b6346fefe50dacd4abba3265248bbadfdd60c739138aa8a0037ba","tests/ui/bad-date.stderr":"1ac3cab13ee900fc8344e8fab21ff4d9cad476aca44925a4c1b2293a6b59b742","tests/ui/bad-not.rs":"f003df8bd245e9dd8edc3a6d94078ee5162fac7a98db881271f0f5b6db98d45d","tests/ui/bad-not.stderr":"d4ef78fae4a82419e737757158796cb103a5920df498956eaf57ed201797b463","tests/ui/bad-version.rs":"f4ea2cd038e6c63deb9c2e3ceffce93dbf179d9ce18c16d88f3b6cd7138a8c8e","tests/ui/bad-version.stderr":"60ed51c62f4c2fb6ff95cff7523cfca379ed434f319da9d82704318588792338","tests/ui/const-not-fn.rs":"10bbe38f0d89391fff0698756e4cfd4e72a41090360393a0c951b67df14d1c35","tests/ui/const-not-fn.stderr":"9551f7f222445b31d7af2415d467301c332d55bb3d5a143846484f2f00047a01"},"package":"cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd"}
152 -\ No newline at end of file
153 -+{"files":{"Cargo.toml":"1a91782510461d54726e816ae776042b95c79c9949d49c11b8782caefc22ead2","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"01dc6a1bf499a12bd0bfbbfe4db2ca8460b2c151235bcf2aad2356de4c2ec50a","build/build.rs":"481daf363b7004c90ffc3e012863a4102e9f26b9aaa2a4a295c2dd78f690be28","build/rustc.rs":"3e4acf7ea679f9331dd4e8dbe42a08a312f58379ea1eee5898793a9848d06d8c","src/attr.rs":"9301cd4aff5a9648c057d5d8de9eb66921f0c3a715c51ada4459576bd49c8b19","src/bound.rs":"44bda74d3aacfeeeac9dae2f7eef3acc844d4c3c7eaa9d3e6288e5aeff269dff","src/constfn.rs":"613b8f53b21cc06b4f619fce9000993d3e7873b650701ca01cef1e53bed5b40a","src/date.rs":"454c749a60db8144a706a813e06fe3ae39c981920ba9832ef82f3f9debe1f052","src/error.rs":"cb37102f03ebbaca313d80f9714fe08dfef92fe956789ee87d93eb6121705f4f","src/expr.rs":"8e8ca76f4f5838436d9d7273f499c698bb41f6c15bc07d32ec5c1cb8bd3dd731","sr
154 c/iter.rs":"8d4b817b9abc4e817105b673e15f29ef9bb8284a010ce01ac2d83387fe136947","src/lib.rs":"f8347832d8072058dbb4af6b8d67a834a02fe9c5460bbaa26defec4b66317f1b","src/release.rs":"abb8ddd877c39a023bf5e7bd67063d6e4144e79758a8bafa338167f9d15b89f1","src/time.rs":"45fb48ff0a0046a5a1b108b9ce53b14885637ad868ede1d66970379c2b7f16ef","src/token.rs":"824ce765f692db73afa02d3ebb0281c750748035efc98fa547be29d3072665ce","src/version.rs":"afdb048bba95bbb885945eba5527b6bf0eca0105642bfc304c2f82a8b7d556df","tests/compiletest.rs":"0a52a44786aea1c299c695bf948b2ed2081e4cc344e5c2cadceab4eb03d0010d","tests/test_const.rs":"a8297ca6559f895a3b2664964a42b6f82bbbc3c8faa9556a513006e6e1827995","tests/test_eval.rs":"6f0ee3f49c9a0d0c374a4d0e9a9dce753cd9fc2ca7725e000a435dbd5f4a9ce3","tests/test_parse.rs":"4e62b190795163370765f57e864458f2cde155a5388777bb5ccf82d282a50116","tests/ui/bad-bound.rs":"25bde278fcaabf62868417148a5e5f2006bf589d7ebd7bf6004fb8d78e47594f","tests/ui/bad-bound.stderr":"bc9297f758c2541fb0a8b48d5785f4bb
155 cd0d2a07d876ba0baf2fc9de9275e7e6","tests/ui/bad-date.rs":"6e23714dae8b6346fefe50dacd4abba3265248bbadfdd60c739138aa8a0037ba","tests/ui/bad-date.stderr":"1ac3cab13ee900fc8344e8fab21ff4d9cad476aca44925a4c1b2293a6b59b742","tests/ui/bad-not.rs":"f003df8bd245e9dd8edc3a6d94078ee5162fac7a98db881271f0f5b6db98d45d","tests/ui/bad-not.stderr":"d4ef78fae4a82419e737757158796cb103a5920df498956eaf57ed201797b463","tests/ui/bad-version.rs":"f4ea2cd038e6c63deb9c2e3ceffce93dbf179d9ce18c16d88f3b6cd7138a8c8e","tests/ui/bad-version.stderr":"60ed51c62f4c2fb6ff95cff7523cfca379ed434f319da9d82704318588792338","tests/ui/const-not-fn.rs":"10bbe38f0d89391fff0698756e4cfd4e72a41090360393a0c951b67df14d1c35","tests/ui/const-not-fn.stderr":"9551f7f222445b31d7af2415d467301c332d55bb3d5a143846484f2f00047a01"},"package":"cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd"}
156 +diff --git a/vendor/rustversion/src/lib.rs b/vendor/rustversion/src/lib.rs
157 +index 2614105dd1a..172eb89382f 100644
158 +--- a/vendor/rustversion/src/lib.rs
159 ++++ b/vendor/rustversion/src/lib.rs
160 +@@ -145,6 +145,21 @@
161 + //!
162 + //! <br>
163 +
164 ++#![allow(
165 ++ clippy::cast_lossless,
166 ++ clippy::cast_possible_truncation,
167 ++ clippy::doc_markdown,
168 ++ clippy::enum_glob_use,
169 ++ clippy::from_iter_instead_of_collect,
170 ++ clippy::module_name_repetitions,
171 ++ clippy::must_use_candidate,
172 ++ clippy::needless_doctest_main,
173 ++ clippy::needless_pass_by_value,
174 ++ clippy::redundant_else,
175 ++ clippy::toplevel_ref_arg,
176 ++ clippy::unreadable_literal
177 ++)]
178 ++
179 + extern crate proc_macro;
180 +
181 + mod attr;
182 +diff --git a/vendor/rustversion/src/time.rs b/vendor/rustversion/src/time.rs
183 +index 1e6dd9066b4..3c21463dd80 100644
184 +--- a/vendor/rustversion/src/time.rs
185 ++++ b/vendor/rustversion/src/time.rs
186 +@@ -1,4 +1,5 @@
187 + use crate::date::Date;
188 ++use std::env;
189 + use std::time::{SystemTime, UNIX_EPOCH};
190 +
191 + // Timestamp of 2016-03-01 00:00:00 in UTC.
192 +@@ -13,14 +14,20 @@
193 +
194 + pub fn today() -> Date {
195 + let default = Date {
196 +- year: 2019,
197 +- month: 1,
198 +- day: 1,
199 ++ year: 2020,
200 ++ month: 2,
201 ++ day: 25,
202 + };
203 + try_today().unwrap_or(default)
204 + }
205 +
206 + fn try_today() -> Option<Date> {
207 ++ if let Some(pkg_name) = env::var_os("CARGO_PKG_NAME") {
208 ++ if pkg_name.to_str() == Some("rustversion-tests") {
209 ++ return None; // Stable date for ui testing.
210 ++ }
211 ++ }
212 ++
213 + let now = SystemTime::now();
214 + let since_epoch = now.duration_since(UNIX_EPOCH).ok()?;
215 + let secs = since_epoch.as_secs();
216 +diff --git a/vendor/rustversion/tests/test_parse.rs b/vendor/rustversion/tests/test_parse.rs
217 +index 843bd73d3e5..cb39b3179f5 100644
218 +--- a/vendor/rustversion/tests/test_parse.rs
219 ++++ b/vendor/rustversion/tests/test_parse.rs
220 +@@ -1,3 +1,5 @@
221 ++#![allow(clippy::enum_glob_use, clippy::must_use_candidate)]
222 ++
223 + include!("../build/rustc.rs");
224 +
225 + #[test]
226 +@@ -76,6 +78,14 @@ fn test_parse() {
227 + }),
228 + },
229 + ),
230 ++ (
231 ++ "rustc 1.52.1-nightly (gentoo)",
232 ++ Version {
233 ++ minor: 52,
234 ++ patch: 1,
235 ++ channel: Dev,
236 ++ },
237 ++ ),
238 + ];
239 +
240 + for (string, expected) in cases {
241 +diff --git a/vendor/rustversion/tests/ui/bad-bound.stderr b/vendor/rustversion/tests/ui/bad-bound.stderr
242 +index f8c498c8577..2c56acbdb33 100644
243 +--- a/vendor/rustversion/tests/ui/bad-bound.stderr
244 ++++ b/vendor/rustversion/tests/ui/bad-bound.stderr
245 +@@ -1,10 +1,10 @@
246 +-error: expected rustc release number like 1.31, or nightly date like 2020-10-26
247 ++error: expected rustc release number like 1.31, or nightly date like 2020-02-25
248 + --> $DIR/bad-bound.rs:1:22
249 + |
250 + 1 | #[rustversion::since(stable)]
251 + | ^^^^^^
252 +
253 +-error: expected rustc release number like 1.31, or nightly date like 2020-10-26
254 ++error: expected rustc release number like 1.31, or nightly date like 2020-02-25
255 + --> $DIR/bad-bound.rs:4:26
256 + |
257 + 4 | #[rustversion::any(since(stable))]
258 +diff --git a/vendor/rustversion/tests/ui/bad-date.stderr b/vendor/rustversion/tests/ui/bad-date.stderr
259 +index 734d7889075..c523ccc02bf 100644
260 +--- a/vendor/rustversion/tests/ui/bad-date.stderr
261 ++++ b/vendor/rustversion/tests/ui/bad-date.stderr
262 +@@ -1,10 +1,10 @@
263 +-error: expected nightly date, like 2020-10-26
264 ++error: expected nightly date, like 2020-02-25
265 + --> $DIR/bad-date.rs:1:24
266 + |
267 + 1 | #[rustversion::nightly(stable)]
268 + | ^^^^^^
269 +
270 +-error: expected nightly date, like 2020-10-26
271 ++error: expected nightly date, like 2020-02-25
272 + --> $DIR/bad-date.rs:4:28
273 + |
274 + 4 | #[rustversion::any(nightly(stable))]
275 --
276 2.32.0
277
278
279 diff --git a/dev-lang/rust/rust-1.53.0.ebuild b/dev-lang/rust/rust-1.53.0.ebuild
280 index 07427b717a4..e8b0c98a8c1 100644
281 --- a/dev-lang/rust/rust-1.53.0.ebuild
282 +++ b/dev-lang/rust/rust-1.53.0.ebuild
283 @@ -148,7 +148,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc"
284 PATCHES=(
285 "${FILESDIR}"/1.47.0-ignore-broken-and-non-applicable-tests.patch
286 "${FILESDIR}"/1.49.0-gentoo-musl-target-specs.patch
287 - "${FILESDIR}"/1.53.0-rustversion.patch #https://github.com/dtolnay/rustversion/issues/28
288 + "${FILESDIR}"/1.53.0-rustversion-1.0.5.patch # https://github.com/rust-lang/rust/pull/86425
289 )
290
291 S="${WORKDIR}/${MY_P}-src"