Rollup of 4 pull requests #116621

aliemjay · 2023-10-11T00:53:18Z

Successful merges:

Add explicit-endian String::from_utf16 variants #95967 (Add explicit-endian String::from_utf16 variants)
delay a bug when encountering an ambiguity in MIR typeck #116530 (delay a bug when encountering an ambiguity in MIR typeck)
Document diagnostic_namespace feature #116611 (Document diagnostic_namespace feature)
Remove unused dominator iterator #116612 (Remove unused dominator iterator)

r? @ghost
@rustbot modify labels: rollup

Co-authored-by: David Tolnay <dtolnay@gmail.com>

Add explicit-endian String::from_utf16 variants This adds the following APIs under `feature(str_from_utf16_endian)`: ```rust impl String { pub fn from_utf16le(v: &[u8]) -> Result<String, FromUtf16Error>; pub fn from_utf16le_lossy(v: &[u8]) -> String; pub fn from_utf16be(v: &[u8]) -> Result<String, FromUtf16Error>; pub fn from_utf16be_lossy(v: &[u8]) -> String; } ``` These are versions of `String::from_utf16` that explicitly take [UTF-16LE and UTF-16BE](https://unicode.org/faq/utf_bom.html#gen7). Notably, we can do better than just the obvious `decode_utf16(v.array_chunks::<2>().copied().map(u16::from_le_bytes)).collect()` in that: - We handle the case where the byte slice is not an even number of bytes, and - In the case that the UTF-16 is native endian and the slice is aligned, we can forward to `String::from_utf16`. If the Unicode Consortium actively defines how to handle character replacement when decoding a UTF-16 bytestream with a trailing odd byte, I was unable to find reference. However, the behavior implemented here is fairly self-evidently correct: replace the single errant byte with the replacement character.

…ler-errors delay a bug when encountering an ambiguity in MIR typeck We shouldn't have any trait selection ambiguities in MIR typeck. See rust-lang#114586 (comment) r? `@oli-obk` `@compiler-errors` `@lcnr`

Document `diagnostic_namespace` feature This adds it to the rust unstable book. FWIW: I couldn't find a way to serve the book locally (please send help), so I can't check that this renders correctly. cc `@weiznich`

Remove unused dominator iterator

aliemjay · 2023-10-11T01:02:56Z

@bors r+ rollup=never p=5

bors · 2023-10-11T01:02:58Z

📌 Commit 88a929b has been approved by aliemjay

It is now in the queue for this repository.

bors · 2023-10-11T01:49:30Z

⌛ Testing commit 88a929b with merge 36cbf94...

bors · 2023-10-11T03:37:53Z

☀️ Test successful - checks-actions
Approved by: aliemjay
Pushing 36cbf94 to master...

rust-timer · 2023-10-11T03:39:04Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#95967	Add explicit-endian String::from_utf16 variants	`9b60ec14490509ce68831b735a308077e7ab4611` (link)
#116530	delay a bug when encountering an ambiguity in MIR typeck	`33c0dec1710ec3ffdb632dccf15391a3f217f5df` (link)
#116611	Document `diagnostic_namespace` feature	`54af23bb8220412e4280d14bbed3c7a00fbab5be` (link)
#116612	Remove unused dominator iterator	`82fb93698f18c9816efe65527d027524964f46c4` (link)

previous master: dcf89f43a5

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

rust-timer · 2023-10-11T05:06:54Z

Finished benchmarking commit (36cbf94): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	0.4%	[0.1%, 0.7%]	6
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	2.2%	[2.2%, 2.2%]	1
Regressions ❌ (secondary)	1.5%	[0.9%, 2.0%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.4%	[-1.4%, -1.4%]	1
All ❌✅ (primary)	2.2%	[2.2%, 2.2%]	1

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	1.7%	[0.9%, 3.0%]	3
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.7%	[0.9%, 3.0%]	3

Binary size

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	1.0%	[0.1%, 1.7%]	24
Regressions ❌ (secondary)	1.6%	[1.0%, 1.7%]	74
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.0%	[0.1%, 1.7%]	24

Bootstrap: 628.069s -> 627.208s (-0.14%)
Artifact size: 270.78 MiB -> 270.95 MiB (0.06%)

CAD97 and others added 11 commits September 28, 2023 23:54

Add feature(str_from_utf16_endian)

8047f8f

style nits

3d448bd

Co-authored-by: David Tolnay <dtolnay@gmail.com>

add str_from_utf16_endian tracking issue

1efea31

fix char imports

5facc32

delay a bug when encountering an ambiguity in MIR typeck

710c073

Remove unused dominator iterator

b61a6d5

Document diagnostic_namespace feature

ba02a99

Rollup merge of rust-lang#116530 - aliemjay:ice-on-ambiguity, r=compi…

a7042a9

…ler-errors delay a bug when encountering an ambiguity in MIR typeck We shouldn't have any trait selection ambiguities in MIR typeck. See rust-lang#114586 (comment) r? `@oli-obk` `@compiler-errors` `@lcnr`

Rollup merge of rust-lang#116611 - mejrs:diagnostic_namespace, r=ehuss

494e971

Document `diagnostic_namespace` feature This adds it to the rust unstable book. FWIW: I couldn't find a way to serve the book locally (please send help), so I can't check that this renders correctly. cc `@weiznich`

Rollup merge of rust-lang#116612 - tmiasko:rm-dom-iter, r=cjgillot

88a929b

Remove unused dominator iterator

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 11, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 11, 2023

bors merged commit 36cbf94 into rust-lang:master Oct 11, 2023
12 checks passed

rustbot added this to the 1.75.0 milestone Oct 11, 2023

aliemjay deleted the rollup-0e2of3c branch October 11, 2023 06:22

Dajamante mentioned this pull request Oct 12, 2023

Pull upstream master 2023 10 12 ferrocene/ferrocene#48

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 4 pull requests #116621

Rollup of 4 pull requests #116621

aliemjay commented Oct 11, 2023

aliemjay commented Oct 11, 2023

bors commented Oct 11, 2023

bors commented Oct 11, 2023

bors commented Oct 11, 2023

rust-timer commented Oct 11, 2023

rust-timer commented Oct 11, 2023

Rollup of 4 pull requests #116621

Rollup of 4 pull requests #116621

Conversation

aliemjay commented Oct 11, 2023

aliemjay commented Oct 11, 2023

bors commented Oct 11, 2023

bors commented Oct 11, 2023

bors commented Oct 11, 2023

rust-timer commented Oct 11, 2023

rust-timer commented Oct 11, 2023

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size