Rollup of 11 pull requests #100511

compiler-errors · 2022-08-13T21:10:16Z

Successful merges:

rustdoc: Rename @has FILE PATTERN to @hasraw FILE PATTERN #100355 (rustdoc: Rename @has FILE PATTERN to @hasraw FILE PATTERN)
avoid some int2ptr casts in thread_local_key tests #100407 (avoid some int2ptr casts in thread_local_key tests)
Fix HIR pretty printing of let else #100434 (Fix HIR pretty printing of let else)
Erase regions better in promote_candidate #100438 (Erase regions better in promote_candidate)
adapt test for msan message change #100445 (adapt test for msan message change)
Remove more Clean trait implementations #100447 (Remove more Clean trait implementations)
Make [rust] use-lld=true work on windows #100464 (Make [rust] use-lld=true work on windows)
Give a helpful diagnostic when the next struct field has an attribute #100475 (Give a helpful diagnostic when the next struct field has an attribute)
wf: correctly shallow_resolve consts #100490 (wf: correctly shallow_resolve consts)
nicer Miri backtraces for from_exposed_addr #100501 (nicer Miri backtraces for from_exposed_addr)
merge two test directories that mean the same thing #100509 (merge two test directories that mean the same thing)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

LLVM commit llvm/llvm-project@057cabd removed the function from the msan error message. This adapts our test accordingly. Found via our experimental rust + llvm @ HEAD bot: https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/12634#018289fe-b0bc-4bab-89b3-fb1d4e38f6db

Before, it would fail with "error: ignoring unknown argument '-Wl,--icf=all'"

See rust-lang#100354 for the rationale.

Reasons: 1. It's shorter. 2. `@matches-literal` seems to contradict itself: a regex is intrinsically not a literal match, while it is still a textual match.

I think `@hasraw` is slightly clearer than `@hastext` since it is actually matching against the raw HTML, not the text nodes.

…ibute

`@!has` (and `@!matches`) with two arguments used to treat the second argument as a literal string of HTML code. Now, that feature has been renamed into `@!hasraw` (and `@!matchesraw`), and the arity-2 `@!has` version is an error. These uses thought the second argument was being treated as an XPath, as with the arity-3 version, but in fact was being treated as literal HTML. Because these were checking for the *absence* of the string, the tests silently did nothing -- an XPath string won't ever be showing up in the test's generated HTML!

rustdoc: Rename `@has FILE PATTERN` to `@hasraw FILE PATTERN` Fixes rust-lang#100354.

…crum avoid some int2ptr casts in thread_local_key tests

…gillot Fix HIR pretty printing of let else Fixes rust-lang#100373 Fixes rust-lang#99318 Fixes rust-lang#99319

Erase regions better in `promote_candidate` Use `tcx.erase_regions` instead of manually walking through the substs.... this also makes the code slightly simpler 🙈 Fixes rust-lang#100360 Fixes rust-lang#89851

adapt test for msan message change LLVM commit llvm/llvm-project@057cabd removed the function from the msan error message. This adapts our test accordingly. Found via our experimental rust + llvm @ HEAD bot: https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/12634#018289fe-b0bc-4bab-89b3-fb1d4e38f6db

…lan-DPC Remove more Clean trait implementations Follow-up of rust-lang#99638. r? ``@Dylan-DPC``

Make `[rust] use-lld=true` work on windows Before, it would fail with "error: ignoring unknown argument '-Wl,--icf=all'" This option was introduced in rust-lang#99062 (well, technically rust-lang#99680) See zulip thread: https://rust-lang.zulipchat.com/#narrow/stream/182449-t-compiler.2Fhelp/topic/rust-lld.3A.20error.3A.20ignoring.20unknown.20argument.20'-Wl.2C--icf.3Dall'

Give a helpful diagnostic when the next struct field has an attribute Fixes rust-lang#100461

wf: correctly `shallow_resolve` consts `shallow_resolve` on `InferConst` is always a noop. this is mostly irrelevant as inference vars should already be resolved at most - if not all - call sites. Haven't actually looked too deeply into whether this was a problem.

…=Mark-Simulacrum nicer Miri backtraces for from_exposed_addr Miri by default warns about using from_exposed_addr; this makes the span for that a bit nicer.

…k_trait_bound, r=compiler-errors merge two test directories that mean the same thing hopefully `hrtb` doesnt have a secret second meaning that i'm not aware of 😆 r? `@compiler-errors`

compiler-errors · 2022-08-13T21:10:27Z

@bors r+ rollup=never p=9

bors · 2022-08-13T21:10:29Z

📌 Commit 860e093 has been approved by compiler-errors

It is now in the queue for this repository.

bors · 2022-08-14T01:30:01Z

⌛ Testing commit 860e093 with merge b76fec3...

bors · 2022-08-14T03:59:59Z

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing b76fec3 to master...

rust-timer · 2022-08-14T04:03:06Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#100509	1aff887b9b72fb9073bc001bbcbc3b8a63daa757
#100501	5059602612fb33cd50dd422c0eaabd168a408a25
#100490	5829375e5b930fb6216fc682565ccef7a0bdea3d
#100475	ba20058f275f46071cca62f14dc3a9f1197f5462
#100464	c82fe82a507bef30f4e4287e11dbe72a7bcd8892
#100447	bc1ff2f9ebd6f8a5d0c32dfee4d72d14e17eb7d1
#100445	6bcdebbb277f1ace9cec2182946a27d3f3b29290
#100438	aa6b1cfdc77bb214f3e1598433e6b96e49d38626
#100434	37889e179d9ee1efc8a2404b6aa898233e9bf2ad
#100407	825acb3382bee9206c116a6be5d32e005a4c5b7e
#100355	2fad65964e2623e0bcb4075d817e5452b28aa546

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 · 2022-08-14T05:15:36Z

Finished benchmarking commit (b76fec3): comparison url.

Instruction count

Primary benchmarks: ❌ relevant regressions found
Secondary benchmarks: no relevant changes found

	mean¹	max	count²
Regressions ❌ (primary)	0.9%	1.1%	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.9%	1.1%	2

Max RSS (memory usage)

Results

Primary benchmarks: ✅ relevant improvement found
Secondary benchmarks: no relevant changes found

	mean¹	max	count²
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-2.1%	-2.1%	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-2.1%	-2.1%	1

Cycles

Results

Primary benchmarks: ❌ relevant regressions found
Secondary benchmarks: ✅ relevant improvements found

	mean¹	max	count²
Regressions ❌ (primary)	2.1%	2.1%	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.9%	-5.9%	3
All ❌✅ (primary)	2.1%	2.1%	2

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

the arithmetic mean of the percent change ↩ ↩² ↩³
number of relevant changes ↩ ↩² ↩³

compiler-errors · 2022-08-14T23:21:44Z

Regarding perf, I saw both of these tests also regress in #100510 -- I feel like it's just noise.

RalfJung and others added 29 commits August 11, 2022 09:39

avoid some int2ptr casts in thread_local_key tests

b5786dc

Fix HIR pretty printing of let else

e182d12

Erase regions better in promote_candidate

f94220f

remove Clean trait implementation for hir::PathSegment

a65647a

remove Clean trait implementation for hir::BareFnTy

001cc12

Make [rust] use-lld=true work on windows

dcead65

Before, it would fail with "error: ignoring unknown argument '-Wl,--icf=all'"

Use different name for arity-2 @has and @matches

2787eb0

See rust-lang#100354 for the rationale.

Rename @{has,matches}-literal to ...text

01408fc

Reasons: 1. It's shorter. 2. `@matches-literal` seems to contradict itself: a regex is intrinsically not a literal match, while it is still a textual match.

Update tests: arity-2 @{has,matches} -> ...text

37eed1d

Rename @hastext to @hasraw (same for matches)

13d5327

I think `@hasraw` is slightly clearer than `@hastext` since it is actually matching against the raw HTML, not the text nodes.

Fix line lengths

9db6061

give a helpful diagnostic even when the next struct field has an attr…

52a1518

…ibute

Update @!has name in tests

b34e240

nicer Miri backtraces for from_exposed_addr

2dc9bf0

move

40b1f61

wf correctly shallow_resolve consts

1ec2b9b

Rollup merge of rust-lang#100355 - camelid:has2-rename, r=GuillaumeGomez

4b51df3

rustdoc: Rename `@has FILE PATTERN` to `@hasraw FILE PATTERN` Fixes rust-lang#100354.

Rollup merge of rust-lang#100407 - RalfJung:no-int2ptr, r=Mark-Simula…

ea42f3c

…crum avoid some int2ptr casts in thread_local_key tests

Rollup merge of rust-lang#100434 - compiler-errors:issue-100373, r=cj…

2126cc6

…gillot Fix HIR pretty printing of let else Fixes rust-lang#100373 Fixes rust-lang#99318 Fixes rust-lang#99319

Rollup merge of rust-lang#100438 - compiler-errors:issue-100360, r=lcnr

9ab54df

Erase regions better in `promote_candidate` Use `tcx.erase_regions` instead of manually walking through the substs.... this also makes the code slightly simpler 🙈 Fixes rust-lang#100360 Fixes rust-lang#89851

Rollup merge of rust-lang#100447 - GuillaumeGomez:rm-clean-impl, r=Dy…

b1d77dd

…lan-DPC Remove more Clean trait implementations Follow-up of rust-lang#99638. r? ``@Dylan-DPC``

Rollup merge of rust-lang#100475 - chenyukang:fix-100461, r=fee1-dead

29f905b

Give a helpful diagnostic when the next struct field has an attribute Fixes rust-lang#100461

Rollup merge of rust-lang#100501 - RalfJung:miri-from-exposed-addr, r…

f8bdd9c

…=Mark-Simulacrum nicer Miri backtraces for from_exposed_addr Miri by default warns about using from_exposed_addr; this makes the span for that a bit nicer.

Rollup merge of rust-lang#100509 - BoxyUwU:merge_hrtb_with_higher_ran…

860e093

…k_trait_bound, r=compiler-errors merge two test directories that mean the same thing hopefully `hrtb` doesnt have a secret second meaning that i'm not aware of 😆 r? `@compiler-errors`

rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Aug 13, 2022

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 13, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 14, 2022

bors merged commit b76fec3 into rust-lang:master Aug 14, 2022

rustbot added this to the 1.65.0 milestone Aug 14, 2022

compiler-errors deleted the rollup-vrte4w5 branch August 11, 2023 20:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 11 pull requests #100511

Rollup of 11 pull requests #100511

compiler-errors commented Aug 13, 2022

compiler-errors commented Aug 13, 2022

bors commented Aug 13, 2022

bors commented Aug 14, 2022

bors commented Aug 14, 2022

rust-timer commented Aug 14, 2022

rust-timer commented Aug 14, 2022

compiler-errors commented Aug 14, 2022 •

edited

Loading

Rollup of 11 pull requests #100511

Rollup of 11 pull requests #100511

Conversation

compiler-errors commented Aug 13, 2022

compiler-errors commented Aug 13, 2022

bors commented Aug 13, 2022

bors commented Aug 14, 2022

bors commented Aug 14, 2022

rust-timer commented Aug 14, 2022

rust-timer commented Aug 14, 2022

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

compiler-errors commented Aug 14, 2022 • edited Loading

compiler-errors commented Aug 14, 2022 •

edited

Loading