Skip to content

Commit edf0182

Browse files
committed
Auto merge of #103888 - Dylan-DPC:rollup-p7gubqj, r=Dylan-DPC
Rollup of 7 pull requests Successful merges: - #103275 (Update tinystr) - #103703 (Gate some parser recovery behind the check) - #103774 (Format `dyn Trait` better in `type_name` intrinsic) - #103807 (Add tracking issue for `string_extend_from_within`) - #103855 (rustdoc: simplify mobile item-table CSS) - #103862 (Use `ObligationCtxt` in `fully_normalize`) - #103864 (Reorder `walk_` functions in intravisit.rs) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents c0a7612 + 5a288dc commit edf0182

File tree

14 files changed

+506
-424
lines changed

14 files changed

+506
-424
lines changed

COPYRIGHT

+50
Original file line numberDiff line numberDiff line change
@@ -339,3 +339,53 @@ their own copyright notices and license terms:
339339
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
340340
USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
341341
OF SUCH DAMAGE.
342+
343+
* Portions of internationalization code use code or data from Unicode, which
344+
carry the following license:
345+
346+
UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
347+
348+
See Terms of Use <https://www.unicode.org/copyright.html>
349+
for definitions of Unicode Inc.’s Data Files and Software.
350+
351+
NOTICE TO USER: Carefully read the following legal agreement.
352+
BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S
353+
DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"),
354+
YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
355+
TERMS AND CONDITIONS OF THIS AGREEMENT.
356+
IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE
357+
THE DATA FILES OR SOFTWARE.
358+
359+
COPYRIGHT AND PERMISSION NOTICE
360+
361+
Copyright © 1991-2022 Unicode, Inc. All rights reserved.
362+
Distributed under the Terms of Use in https://www.unicode.org/copyright.html.
363+
364+
Permission is hereby granted, free of charge, to any person obtaining
365+
a copy of the Unicode data files and any associated documentation
366+
(the "Data Files") or Unicode software and any associated documentation
367+
(the "Software") to deal in the Data Files or Software
368+
without restriction, including without limitation the rights to use,
369+
copy, modify, merge, publish, distribute, and/or sell copies of
370+
the Data Files or Software, and to permit persons to whom the Data Files
371+
or Software are furnished to do so, provided that either
372+
(a) this copyright and permission notice appear with all copies
373+
of the Data Files or Software, or
374+
(b) this copyright and permission notice appear in associated
375+
Documentation.
376+
377+
THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
378+
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
379+
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
380+
NONINFRINGEMENT OF THIRD PARTY RIGHTS.
381+
IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
382+
NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
383+
DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
384+
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
385+
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
386+
PERFORMANCE OF THE DATA FILES OR SOFTWARE.
387+
388+
Except as contained in this notice, the name of a copyright holder
389+
shall not be used in advertising or otherwise to promote the sale,
390+
use or other dealings in these Data Files or Software without prior
391+
written authorization of the copyright holder.

Cargo.lock

+26-13
Original file line numberDiff line numberDiff line change
@@ -1154,6 +1154,17 @@ dependencies = [
11541154
"winapi",
11551155
]
11561156

1157+
[[package]]
1158+
name = "displaydoc"
1159+
version = "0.2.3"
1160+
source = "registry+https://github.com/rust-lang/crates.io-index"
1161+
checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886"
1162+
dependencies = [
1163+
"proc-macro2",
1164+
"quote",
1165+
"syn",
1166+
]
1167+
11571168
[[package]]
11581169
name = "dlmalloc"
11591170
version = "0.2.3"
@@ -1834,11 +1845,10 @@ dependencies = [
18341845

18351846
[[package]]
18361847
name = "intl_pluralrules"
1837-
version = "7.0.1"
1848+
version = "7.0.2"
18381849
source = "registry+https://github.com/rust-lang/crates.io-index"
1839-
checksum = "b18f988384267d7066cc2be425e6faf352900652c046b6971d2e228d3b1c5ecf"
1850+
checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972"
18401851
dependencies = [
1841-
"tinystr",
18421852
"unic-langid",
18431853
]
18441854

@@ -4949,9 +4959,12 @@ dependencies = [
49494959

49504960
[[package]]
49514961
name = "tinystr"
4952-
version = "0.3.4"
4962+
version = "0.7.0"
49534963
source = "registry+https://github.com/rust-lang/crates.io-index"
4954-
checksum = "29738eedb4388d9ea620eeab9384884fc3f06f586a2eddb56bedc5885126c7c1"
4964+
checksum = "f8aeafdfd935e4a7fe16a91ab711fa52d54df84f9c8f7ca5837a9d1d902ef4c2"
4965+
dependencies = [
4966+
"displaydoc",
4967+
]
49554968

49564969
[[package]]
49574970
name = "tinyvec"
@@ -5187,28 +5200,28 @@ dependencies = [
51875200

51885201
[[package]]
51895202
name = "unic-langid"
5190-
version = "0.9.0"
5203+
version = "0.9.1"
51915204
source = "registry+https://github.com/rust-lang/crates.io-index"
5192-
checksum = "73328fcd730a030bdb19ddf23e192187a6b01cd98be6d3140622a89129459ce5"
5205+
checksum = "398f9ad7239db44fd0f80fe068d12ff22d78354080332a5077dc6f52f14dcf2f"
51935206
dependencies = [
51945207
"unic-langid-impl",
51955208
"unic-langid-macros",
51965209
]
51975210

51985211
[[package]]
51995212
name = "unic-langid-impl"
5200-
version = "0.9.0"
5213+
version = "0.9.1"
52015214
source = "registry+https://github.com/rust-lang/crates.io-index"
5202-
checksum = "1a4a8eeaf0494862c1404c95ec2f4c33a2acff5076f64314b465e3ddae1b934d"
5215+
checksum = "e35bfd2f2b8796545b55d7d3fd3e89a0613f68a0d1c8bc28cb7ff96b411a35ff"
52035216
dependencies = [
52045217
"tinystr",
52055218
]
52065219

52075220
[[package]]
52085221
name = "unic-langid-macros"
5209-
version = "0.9.0"
5222+
version = "0.9.1"
52105223
source = "registry+https://github.com/rust-lang/crates.io-index"
5211-
checksum = "18f980d6d87e8805f2836d64b4138cc95aa7986fa63b1f51f67d5fbff64dd6e5"
5224+
checksum = "055e618bf694161ffff0466d95cef3e1a5edc59f6ba1888e97801f2b4ebdc4fe"
52125225
dependencies = [
52135226
"proc-macro-hack",
52145227
"tinystr",
@@ -5218,9 +5231,9 @@ dependencies = [
52185231

52195232
[[package]]
52205233
name = "unic-langid-macros-impl"
5221-
version = "0.9.0"
5234+
version = "0.9.1"
52225235
source = "registry+https://github.com/rust-lang/crates.io-index"
5223-
checksum = "29396ffd97e27574c3e01368b1a64267d3064969e4848e2e130ff668be9daa9f"
5236+
checksum = "1f5cdec05b907f4e2f6843f4354f4ce6a5bebe1a56df320a49134944477ce4d8"
52245237
dependencies = [
52255238
"proc-macro-hack",
52265239
"quote",

compiler/rustc_const_eval/src/util/type_name.rs

+2-10
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,10 @@ impl<'tcx> Printer<'tcx> for AbsolutePathPrinter<'tcx> {
7373
}
7474

7575
fn print_dyn_existential(
76-
mut self,
76+
self,
7777
predicates: &'tcx ty::List<ty::Binder<'tcx, ty::ExistentialPredicate<'tcx>>>,
7878
) -> Result<Self::DynExistential, Self::Error> {
79-
let mut first = true;
80-
for p in predicates {
81-
if !first {
82-
write!(self, "+")?;
83-
}
84-
first = false;
85-
self = p.print(self)?;
86-
}
87-
Ok(self)
79+
self.pretty_print_dyn_existential(predicates)
8880
}
8981

9082
fn path_crate(mut self, cnum: CrateNum) -> Result<Self::Path, Self::Error> {

0 commit comments

Comments
 (0)