Rollup of 9 pull requests #120660

matthiaskrgr · 2024-02-05T05:37:18Z

Successful merges:

Clarify ambiguity in select_nth_unstable docs #119481 (Clarify ambiguity in select_nth_unstable docs)
Remove outdated references to librustc_middle #119600 (Remove outdated references to librustc_middle)
Document &CStr to CString conversion #120458 (Document &CStr to CString conversion)
coverage: Improve handling of function/closure spans #120569 (coverage: Improve handling of function/closure spans)
Update libc to 0.2.153 #120572 (Update libc to 0.2.153)
miri: normalize struct tail in ABI compat check #120587 (miri: normalize struct tail in ABI compat check)
fix #120603 by adding a check in default_read_buf #120607 (fix Unsoundness in BufReader with a broken inner Read impl #120603 by adding a check in default_read_buf)
Subtree update of rust-analyzer #120636 (Subtree update of rust-analyzer)
rustdoc: trait.impl, type.impl: sort impls to make it not depend on serialization order #120641 (rustdoc: trait.impl, type.impl: sort impls to make it not depend on serialization order)

r? @ghost
@rustbot modify labels: rollup

The `CString` handling code is erroneously identical to the `ByteString` handling code.

- Rename it as `MixedUnit`, because it will soon be used in more than just C string literals. - Change the `Byte` variant to `HighByte` and use it only for `\x80`..`\xff` cases. This fixes the old inexactness where ASCII chars could be encoded with either `Byte` or `Char`. - Add useful comments. - Remove `is_ascii`, in favour of `u8::is_ascii`.

`unescape_literal` becomes `unescape_unicode`, and `unescape_c_string` becomes `unescape_mixed`. Because rfc3349 will mean that C string literals will no longer be the only mixed utf8 literals.

… macro

…ested use tree selections

…sted use tree selections

…m-ra

Add postfix completion for let else Adds a postfix completion for let else syntax, similar to the if let postfix.

feat: Support for GOTO def from *inside* files included with include! macro close rust-lang#14937 Try to implement goto def from *inside* files included with include! macro. This implementation has two limitations: 1. Only **one** file which calls include! will be tracked. (I think multiple file be included is a rare case and we may let it go for now) 2. Mapping token from included file to macro call file (semantics.rs:646~658) works fine but I am not sure is this the correct way to implement.

intenral: Cleanup error variants in MIR code a bit

…RalfJung miri: normalize struct tail in ABI compat check fixes rust-lang/miri#3282 extracted from rust-lang#120354, see rust-lang#120354 (comment) for context r? ```@RalfJung```

fix rust-lang#120603 by adding a check in default_read_buf Fixes rust-lang#120603 by checking the returned read n is in-bounds of the cursor. Interestingly, I noticed that `BorrowedBuf` side-steps this issue by using checked accesses. Maybe this can be switched to unchecked to mirror what BufReader does https://github.com/rust-lang/rust/blob/bf3c6c5bed498f41ad815641319a1ad9bcecb8e8/library/core/src/io/borrowed_buf.rs#L95

Subtree update of `rust-analyzer` r? ghost

rustdoc: trait.impl, type.impl: sort impls to make it not depend on serialization order Can be tested by running `cargo doc` with different rust versions on some crate and comparing `doc` folders: files in `trait.impl` and `type.impl` will sometimes have different order of impls.

matthiaskrgr · 2024-02-05T05:37:39Z

@bors r+ rollup=never p=9

bors · 2024-02-05T05:37:42Z

📌 Commit a2d3eed has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-02-05T06:24:10Z

⌛ Testing commit a2d3eed with merge 8c0b4f6...

bors · 2024-02-05T08:24:29Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 8c0b4f6 to master...

rust-timer · 2024-02-05T08:27:00Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#119481	Clarify ambiguity in select_nth_unstable docs	`afa08396c38a3d0b925134cf0fe8734189e2f521` (link)
#119600	Remove outdated references to librustc_middle	`934d3948934a337fa54b621c664c96a811ef0559` (link)
#120458	Document `&CStr` to `CString` conversion	`93b85b0a20593b62f1c9d18458e9f2b2496dbfb0` (link)
#120569	coverage: Improve handling of function/closure spans	`b36cac0d04243ed8eab9a170c6bc6cd0a75d099a` (link)
#120572	Update libc to 0.2.153	`52bd56610d742cb4975258191cbe7ff09560fe5b` (link)
#120587	miri: normalize struct tail in ABI compat check	`0fc15238d111154bce9dea97bedf21ee5f677d0a` (link)
#120607	fix #120603 by adding a check in default_read_buf	`5c906ab8c21f8c9674ce7ac47f19640191718666` (link)
#120636	Subtree update of `rust-analyzer`	`b7e03a6406c007eed806d7c93787b69f55ca9f34` (link)
#120641	rustdoc: trait.impl, type.impl: sort impls to make it not d…	`6336caaf2513018565104cd4cff8a7d48318496e` (link)

previous master: 0984becf01

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 · 2024-02-05T10:22:58Z

Finished benchmarking commit (8c0b4f6): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

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.8%	[0.2%, 1.4%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.2%	[-0.3%, -0.2%]	2
All ❌✅ (primary)	0.8%	[0.2%, 1.4%]	2

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)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-7.2%	[-7.2%, -7.2%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-7.2%	[-7.2%, -7.2%]	1

Cycles

This benchmark run did not return any relevant results for this metric.

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)	0.1%	[0.0%, 0.1%]	4
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.2%	[-0.2%, -0.2%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.0%	[-0.2%, 0.1%]	5

Bootstrap: 664.243s -> 659.551s (-0.71%)
Artifact size: 308.11 MiB -> 308.15 MiB (0.01%)

Mark-Simulacrum · 2024-02-05T13:20:47Z

@rust-timer build 0fc1523

Mark-Simulacrum · 2024-02-05T13:21:07Z

@rust-timer build 5c906ab

rust-timer · 2024-02-05T15:21:30Z

Finished benchmarking commit (0fc1523): comparison URL.

Overall result: no relevant changes - no action needed

Instruction count

This benchmark run did not return any relevant results for this metric.

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)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.4%	[-3.4%, -3.4%]	1
All ❌✅ (primary)	-	-	0

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)	-	-	0
Regressions ❌ (secondary)	8.2%	[8.2%, 8.2%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 664.243s -> 661.477s (-0.42%)
Artifact size: 308.11 MiB -> 308.11 MiB (-0.00%)

Kobzol · 2024-02-13T07:47:10Z

The ripgrep regression looks like noise, it blipped back soon after, and then blipped back and forth further.

@rustbot label: +perf-regression-triaged

romanows and others added 30 commits December 31, 2023 15:09

Clarify ambiguity in select_nth_unstable docs

7ac4515

Remove outdated references to librustc_middle.

16e117c

feat: add conflict ext (panicbit.cargo) detect

e15f40e

fix lint and fmt

56f54c8

Fix copy/paste error.

85d56ee

The `CString` handling code is erroneously identical to the `ByteString` handling code.

Rename the unescaping functions.

858f4ac

`unescape_literal` becomes `unescape_unicode`, and `unescape_c_string` becomes `unescape_mixed`. Because rfc3349 will mean that C string literals will no longer be the only mixed utf8 literals.

minor: update conflict extension detect logic

96ebad0

make ast::UseTree::wrap_in_tree_list more robust

da798bc

Add postfix completion for let else

57934ac

Make return a snippet

51d57b9

Remove letelse control flow snippets

7ec32d0

feat: Support for GOTO def from *inside* files included with include!…

b22e772

… macro

normalize use trees when merging imports

8fab92f

remove ordered insert logic from recursive merge function

81d713e

add normalize import assist

a8a18f3

merge imports assist always applies to covering use item except for n…

b241593

…ested use tree selections

merge imports assist avoids adding unnecessary braces when merging ne…

fc00602

…sted use tree selections

add more tests for normalize import assist

84e1314

feat: enable excluding refs search results in test

6f303f4

test: add test for excluding refs

1bd21e9

Merge commit '7219414e81810fd4d967136c4a0650523892c157' into sync-fro…

f43cea0

…m-ra

Document From<&CStr> for CString

6aec11a

fix: use Semantics to judge whether a func is marked as #[test]

6181102

test: add full path ref exclude test case

2b71aca

Auto merge of rust-lang#15730 - Alainx277:let-else-postfix, r=Veykril

d13951f

Add postfix completion for let else Adds a postfix completion for let else syntax, similar to the if let postfix.

Bump scip

20c0167

Cleanup error variants in MIR code slightly

5860763

Auto merge of rust-lang#16447 - Veykril:mir-errors, r=Veykril

11b401d

intenral: Cleanup error variants in MIR code a bit

matthiaskrgr added 4 commits February 5, 2024 06:37

Rollup merge of rust-lang#120587 - lukas-code:miri-tail-normalize, r=…

e348f07

…RalfJung miri: normalize struct tail in ABI compat check fixes rust-lang/miri#3282 extracted from rust-lang#120354, see rust-lang#120354 (comment) for context r? ```@RalfJung```

Rollup merge of rust-lang#120636 - lnicola:sync-from-ra, r=lnicola

bc98f57

Subtree update of `rust-analyzer` r? ghost

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 Feb 5, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 5, 2024

bors merged commit 8c0b4f6 into rust-lang:master Feb 5, 2024
12 checks passed

rustbot added this to the 1.78.0 milestone Feb 5, 2024

This was referenced Feb 5, 2024

improve normalization of Pointee::Metadata #120354

Merged

cargo update #120454

Merged

rustbot added the perf-regression Performance regression. label Feb 5, 2024

This comment has been minimized.

Sign in to view

rustbot added the perf-regression-triaged The performance regression has been triaged. label Feb 13, 2024

matthiaskrgr deleted the rollup-zuqljul branch March 16, 2024 18:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 9 pull requests #120660

Rollup of 9 pull requests #120660

matthiaskrgr commented Feb 5, 2024

matthiaskrgr commented Feb 5, 2024

bors commented Feb 5, 2024

bors commented Feb 5, 2024

bors commented Feb 5, 2024

rust-timer commented Feb 5, 2024

rust-timer commented Feb 5, 2024

Mark-Simulacrum commented Feb 5, 2024 •

edited

Loading

This comment has been minimized.

Mark-Simulacrum commented Feb 5, 2024

rust-timer commented Feb 5, 2024

Kobzol commented Feb 13, 2024

Rollup of 9 pull requests #120660

Rollup of 9 pull requests #120660

Conversation

matthiaskrgr commented Feb 5, 2024

matthiaskrgr commented Feb 5, 2024

bors commented Feb 5, 2024

bors commented Feb 5, 2024

bors commented Feb 5, 2024

rust-timer commented Feb 5, 2024

rust-timer commented Feb 5, 2024

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Mark-Simulacrum commented Feb 5, 2024 • edited Loading

This comment has been minimized.

Mark-Simulacrum commented Feb 5, 2024

rust-timer commented Feb 5, 2024

Overall result: no relevant changes - no action needed

Kobzol commented Feb 13, 2024

Mark-Simulacrum commented Feb 5, 2024 •

edited

Loading