Rollup of 8 pull requests by matthiaskrgr · Pull Request #108677 · rust-lang/rust

matthiaskrgr · 2023-03-02T22:05:32Z

Successful merges:

Support allocations with non-Box<[u8]> bytes #108022 (Support allocations with non-Box<[u8]> bytes)
Re-apply "switch to the macos-12-xl builder" #108367 (Re-apply "switch to the macos-12-xl builder")
Point error span at Some constructor argument when trait resolution fails #108557 (Point error span at Some constructor argument when trait resolution fails)
Explain compile-time vs run-time difference in env!() error message #108573 (Explain compile-time vs run-time difference in env!() error message)
Put backtick content from rustdoc search errors into a <code> elements #108584 (Put backtick content from rustdoc search errors into a <code> elements)
Make ExprKind the first field in thir::Expr #108624 (Make ExprKind the first field in thir::Expr)
Allow setting hashmap toml values in ./configure #108644 (Allow setting hashmap toml values in ./configure)
Feed queries on impl side for RPITITs when using lower_impl_trait_in_trait_to_assoc_ty #108672 (Feed queries on impl side for RPITITs when using lower_impl_trait_in_trait_to_assoc_ty)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

…ons for miri. Credit to emarteca for the code.

This reverts commit e63ec2e.

…ails

This makes its `Debug` impl print it first which is useful, as it's the most important part when looking at an expr.

…trait_to_assoc_ty

Support allocations with non-Box<[u8]> bytes This is prep work for allowing miri to support passing pointers to C code, which will require `Allocation`s to be correctly aligned. Currently, it just makes `Allocation` generic and plumbs the necessary changes through the right places. The follow-up to this will be adding a type in the miri interpreter which correctly aligns the bytes, using that for the Miri engine, then allowing Miri to pass pointers into these allocations to C calls. Based off of rust-lang#100467, credit to ```@emarteca``` for the code

… r=pietroalbini Re-apply "switch to the macos-12-xl builder" This reverts commit e63ec2e, essentially re-applying fcbae98. r? ````@pietroalbini````

…-span-fix-Some, r=WaffleLapkin Point error span at Some constructor argument when trait resolution fails This is a follow up to rust-lang#108254 and rust-lang#106477 which extends error span refinement to handle a case which I mistakenly believed was handled in rust-lang#106477. The goal is to refine the error span depicted below: ```rs trait Fancy {} impl <T> Fancy for Option<T> where T: Iterator {} fn want_fancy<F>(f: F) where F: Fancy {} fn example() { want_fancy(Some(5)); // (BEFORE) ^^^^^^^ `{integer}` is not an iterator // (AFTER) ^ `{integer}` is not an iterator } ``` I had used a (slightly more complex) example as an illustrative example in rust-lang#108254 , but hadn't actually turned it into a test, because I had (incorrectly) believed at the time it was covered by existing behavior. It turns out that `Some` is slightly "special" in that it resolves differently from the other `enum` constructors I had tried, and therefore this test was actually broken. I've now updated the tests to include this example, and fixed the code to correctly resolve the `Some` constructor so that the span of the error is reduced.

Explain compile-time vs run-time difference in env!() error message This PR is clarifying error message of `env!()` based on this user question: https://users.rust-lang.org/t/environment-variable-out-dir-is-undefined/90067 It makes it clear that `env!()` is for env variables defined at compile-time. There's special-case help text for common Cargo build script variables. I've also rearranged the code to avoid allocating error message on the happy path when the env var is defined.

…ground, r=notriddle Put backtick content from rustdoc search errors into a <code> elements Some screenshots of the result: ![Screenshot from 2023-02-28 22-37-09](https://user-images.githubusercontent.com/3050060/221990290-fa84f1cf-5a64-4ce5-8433-ee36cedf4c00.png) ![Screenshot from 2023-02-28 22-36-59](https://user-images.githubusercontent.com/3050060/221990298-f8177eeb-894b-4fce-a6fc-06d17c8b7ca2.png) ![Screenshot from 2023-02-28 22-36-51](https://user-images.githubusercontent.com/3050060/221990301-41bffd64-d041-41f1-995a-983925b1fbb1.png) You can test it [here](https://rustdoc.crud.net/imperio/rustdoc-search-background/foo/index.html?search=%22). r? ```@notriddle```

Make `ExprKind` the first field in `thir::Expr` This makes its `Debug` impl print it first which is useful, as it's the most important part when looking at an expr.

…arsan68 Allow setting hashmap toml values in `./configure` Fixesrust-lang#108621

…=compiler-errors Feed queries on impl side for RPITITs when using lower_impl_trait_in_trait_to_assoc_ty I've added a test for traits that were already working and what I think is probably the last bit of infrastructure work needed. In following PRs I'm going to start adding things TDD style, tests and code that make it work. r? `@compiler-errors`

matthiaskrgr · 2023-03-03T06:04:40Z

@bors treeclosed=100 aarch64 is not responding after github outage

matthiaskrgr · 2023-03-03T16:02:27Z

@bors retry p=142

bors · 2023-03-03T16:02:40Z

⌛ Testing commit e85df8d with merge 7a809ce...

matthiaskrgr · 2023-03-03T16:04:46Z

@bors treeclosed-

rust-log-analyzer · 2023-03-03T16:59:16Z

A job failed! Check out the build log: (web)(plain)

Click to see the possible cause of the failure (guessed by this bot)

bors · 2023-03-03T18:48:11Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 7a809ce to master...

rust-timer · 2023-03-03T18:50:29Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#108672	fa2bd76af24e20b5ede95faf384aa7a4e96da858
#108644	fa78b5a2d282dd7f89defbc4e3ffbf9c4eea1b47
#108624	2364cfab0ab30176cb9b9c0fcb0746ce598fcc0e
#108584	81f1b48e93e424c9bf6b919bf6a0e90e22126694
#108573	767f3bbc00883b5dd3260791b756e8058c97fd25
#108557	c5601b17f4859e577b25d549e1d9e47edbab9351
#108367	6e61fca5a07985ca2c0e2400837722947dc1e083
#108022	45ca60f5a79620757fe630f10c138c8cdb152f55

previous master: 13471d3b20

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-03-03T21:03:23Z

Finished benchmarking commit (7a809ce): comparison URL.

Overall result: ✅ improvements - 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
Improvements ✅ (primary)	-0.6%	[-0.7%, -0.6%]	3
Improvements ✅ (secondary)	-0.4%	[-0.5%, -0.3%]	4
All ❌✅ (primary)	-0.6%	[-0.7%, -0.6%]	3

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

CraftSpiderand others added 27 commits February 20, 2023 13:47

Allow non-Box allocations in preparation for aligned const allocati…
6f407d6
…ons for miri. Credit to emarteca for the code.

Add mentioned from_raw_bytes constructor
b2455dc

Fix alloc_base_addr type
f1f40ac

Remove unused lifetime
871c1de

Minimal changes to make miri work
936b567

Re-apply "switch to the macos-12-xl builder"
506ce7e
This reverts commit e63ec2e.

Point error span at Some constructor argument when trait resolution f…
2566b41
…ails

Explain compile-time vs run-time difference in env!() error message
2407b0c

Make zeroed return an Option
3a87a18

Fix error spans for arguments to tuple enum constructors
f0212e6

restore unaddressed FIXME
be15f17

Format
f26b0a2

Put backtick content from rustdoc search errors into a <code> elements
4e560d7

Update rustdoc-js test tool
6b0b654

Add GUI test for rustdoc search errors background
cfb4af8

Allow setting hashmap toml values in ./configure
a6580ba

Make ExprKind the first field in thir::Expr
e3d397a
This makes its `Debug` impl print it first which is useful, as it's the most important part when looking at an expr.

Add simple trait test
12b81a5

Feed queries on impl side for RPITITs when using lower_impl_trait_in_…
fa6bf2a
…trait_to_assoc_ty

Rollup merge ofrust-lang#108367- compiler-errors:xl-builders-again,…
a27a4e4
… r=pietroalbini Re-apply "switch to the macos-12-xl builder" This reverts commit e63ec2e, essentially re-applying fcbae98. r? ````@pietroalbini````

Rollup merge ofrust-lang#108624- Nilstrieb:move-it-up, r=WaffleLapkin
7c4e9dd
Make `ExprKind` the first field in `thir::Expr` This makes its `Debug` impl print it first which is useful, as it's the most important part when looking at an expr.

Rollup merge ofrust-lang#108644- KittyBorgX:hashmap-toml, r=albertl…
8a21bce
…arsan68 Allow setting hashmap toml values in `./configure` Fixesrust-lang#108621

rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Mar 2, 2023

matthiaskrgr closed this Mar 3, 2023

matthiaskrgr reopened this Mar 3, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 3, 2023

bors merged commit 7a809ce into rust-lang:masterMar 3, 2023

rustbot added this to the 1.69.0 milestone Mar 3, 2023

This was referenced Mar 3, 2023
rustdoc: Allow whitespace as path separator like double colon #108537
Merged
rustdoc: add support for type filters in arguments and generics #108629
Merged

matthiaskrgr deleted the rollup-i91cxuf branch March 16, 2024 18:19

Navigation Menu

Uh oh!

Uh oh!

Rollup of 8 pull requests - #108677

Rollup of 8 pull requests#108677
bors merged 27 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-i91cxuf

matthiaskrgr commented Mar 2, 2023•
edited
Loading

Uh oh!

matthiaskrgr commented Mar 3, 2023

Uh oh!

matthiaskrgr commented Mar 3, 2023

Uh oh!

bors commented Mar 3, 2023

Uh oh!

matthiaskrgr commented Mar 3, 2023

Uh oh!

rust-log-analyzer commented Mar 3, 2023

Uh oh!

bors commented Mar 3, 2023

Uh oh!

rust-timer commented Mar 3, 2023

Uh oh!

rust-timer commented Mar 3, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

14 participants

Uh oh!

Uh oh!

Conversation

matthiaskrgr commented Mar 2, 2023• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

matthiaskrgr commented Mar 3, 2023

Uh oh!

matthiaskrgr commented Mar 3, 2023

Uh oh!

bors commented Mar 3, 2023

Uh oh!

matthiaskrgr commented Mar 3, 2023

Uh oh!

rust-log-analyzer commented Mar 3, 2023

Uh oh!

bors commented Mar 3, 2023

Uh oh!

rust-timer commented Mar 3, 2023

Uh oh!

rust-timer commented Mar 3, 2023

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

14 participants

matthiaskrgr commented Mar 2, 2023•
edited
Loading