Rollup of 6 pull requests #103083

Dylan-DPC · 2022-10-15T10:15:34Z

Successful merges:

Use semaphores for thread parking on Apple platforms #102773 (Use semaphores for thread parking on Apple platforms)
resolve: Some cleanup, asserts and tests for lifetime ribs #102884 (resolve: Some cleanup, asserts and tests for lifetime ribs)
Add missing checks for doc(cfg_hide(...)) #102954 (Add missing checks for doc(cfg_hide(...)))
Drop temporaries created in a condition, even if it's a let chain #102998 (Drop temporaries created in a condition, even if it's a let chain)
Fix suggest_floating_point_literal ICE #103003 (Fix suggest_floating_point_literal ICE)
Update cargo #103041 (Update cargo)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

by the end of the condition's execution

and cleanup lifetime rib walking loops

12 commits in b8f30cb23c4e5f20854a4f683325782b7cff9837..b332991a57c9d055f1864de1eed93e2178d49440 2022-10-10 19:16:06 +0000 to 2022-10-13 22:05:28 +0000 - Differentiate the warning when an alias (built-in or user-defined) shadows an external subcommand (rust-lang/cargo#11170) - chore: Update tests for latest clap (rust-lang/cargo#11235) - feat(publish): Support 'publish.timeout' config behind '-Zpublish-timeout' (rust-lang/cargo#11230) - Add missing edition (rust-lang/cargo#11231) - doc(profiles): add module level doc (rust-lang/cargo#11219) - refactor(publish): Clarify which SourceId is being used (rust-lang/cargo#11216) - Add new SourceKind::SparseRegistry to differentiate sparse registries (rust-lang/cargo#11209) - Fix deadlock when build scripts are waiting for input on stdin (rust-lang/cargo#11205) - refactor: New variant `FeaturesFor::ArtifactDep` (rust-lang/cargo#11184) - Fix rustdoc warning about unclosed HTML tag (rust-lang/cargo#11221) - refactor(tests): Prepare for wait-for-publish test changes (rust-lang/cargo#11210) - Add configuration option for controlling crates.io protocol (rust-lang/cargo#11215)

Use semaphores for thread parking on Apple platforms Currently we use a mutex-condvar pair for thread parking on Apple systems. Unfortunately, `pthread_cond_timedwait` uses the real-time clock for measuring time, which causes problems when the system time changes. The parking implementation in this PR uses a semaphore instead, which measures monotonic time by default, avoiding these issues. As a further benefit, this has the potential to improve performance a bit, since `unpark` does not need to wait for a lock to be released. Since the Mach semaphores are poorly documented (I could not find availability or stability guarantees for instance), this uses a [dispatch semaphore](https://developer.apple.com/documentation/dispatch/dispatch_semaphore?language=objc) instead. While it adds a layer of indirection (it uses Mach semaphores internally), the overhead is probably negligible. Tested on macOS 12.5. r? ``````@thomcc``````

resolve: Some cleanup, asserts and tests for lifetime ribs Follow up to rust-lang#98279 and friends. r? ``@cjgillot``

…s, r=Manishearth Add missing checks for `doc(cfg_hide(...))` Part of rust-lang#43781. The `doc(cfg_hide(...))` attribute can only be used at the crate level and takes a list of attributes as argument. r? ```@Manishearth```

…r=eholk Drop temporaries created in a condition, even if it's a let chain Fixes rust-lang#100513. During the lowering from AST to HIR we wrap expressions acting as conditions in a `DropTemps` expression so that any temporaries created in the condition are dropped after the condition is executed. Effectively this means we transform ```rust if Some(1).is_some() { .. } ``` into (roughly) ```rust if { let _t = Some(1).is_some(); _t } { .. } ``` so that if we create any temporaries, they're lifted into the new scope surrounding the condition, so for example something along the lines of ```rust if { let temp = Some(1); let _t = temp.is_some(); _t }. ``` Before this PR, if the condition contained any let expressions we would not introduce that new scope, instead leaving the condition alone. This meant that in a let-chain like ```rust if get_drop("first").is_some() && let None = get_drop("last") { println!("second"); } else { .. } ``` the temporary created for `get_drop("first")` would be lifted into the _surrounding block_, which caused it to be dropped after the execution of the entire `if` expression. After this PR, we wrap everything but the `let` expression in terminating scopes. The upside to this solution is that it's minimally invasive, but the downside is that in the worst case, an expression with `let` exprs interspersed like ```rust if get_drop("first").is_some() && let Some(_a) = get_drop("fifth") && get_drop("second").is_some() && let Some(_b) = get_drop("fourth") { .. } ``` gets _multiple_ new scopes, roughly ```rust if { let _t = get_drop("first").is_some(); _t } && let Some(_a) = get_drop("fifth") && { let _t = get_drop("second").is_some(); _t } && let Some(_b) = get_drop("fourth") { .. } ``` so instead of all of the temporaries being dropped at the end of the entire condition, they will be dropped right after they're evaluated (before the subsequent `let` expr). So while I'd say the drop behavior around let-chains is _less_ surprising after this PR, it still might not exactly match what people might expect. For tests, I've just extended the drop order tests added in rust-lang#100526. I'm not sure if that's the best way to go about it, though, so suggestions are welcome.

Fix `suggest_floating_point_literal` ICE Fixes rust-lang#102989

Update cargo 12 commits in b8f30cb23c4e5f20854a4f683325782b7cff9837..b332991a57c9d055f1864de1eed93e2178d49440 2022-10-10 19:16:06 +0000 to 2022-10-13 22:05:28 +0000 - Differentiate the warning when an alias (built-in or user-defined) shadows an external subcommand (rust-lang/cargo#11170) - chore: Update tests for latest clap (rust-lang/cargo#11235) - feat(publish): Support 'publish.timeout' config behind '-Zpublish-timeout' (rust-lang/cargo#11230) - Add missing edition (rust-lang/cargo#11231) - doc(profiles): add module level doc (rust-lang/cargo#11219) - refactor(publish): Clarify which SourceId is being used (rust-lang/cargo#11216) - Add new SourceKind::SparseRegistry to differentiate sparse registries (rust-lang/cargo#11209) - Fix deadlock when build scripts are waiting for input on stdin (rust-lang/cargo#11205) - refactor: New variant `FeaturesFor::ArtifactDep` (rust-lang/cargo#11184) - Fix rustdoc warning about unclosed HTML tag (rust-lang/cargo#11221) - refactor(tests): Prepare for wait-for-publish test changes (rust-lang/cargo#11210) - Add configuration option for controlling crates.io protocol (rust-lang/cargo#11215)

Dylan-DPC · 2022-10-15T10:21:45Z

@bors r+ rollup=never p=5

bors · 2022-10-15T10:21:47Z

📌 Commit ac23c9f has been approved by Dylan-DPC

It is now in the queue for this repository.

bors · 2022-10-15T10:45:39Z

⌛ Testing commit ac23c9f with merge c93ef33...

bors · 2022-10-15T13:30:07Z

☀️ Test successful - checks-actions
Approved by: Dylan-DPC
Pushing c93ef33 to master...

rust-timer · 2022-10-15T13:32:06Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#103041	5e7f9bdfa3b59845734efcdd23cc2e4c5d0d2514
#103003	d3d6007185b57014d3702ca04861a29e23c0e7b5
#102998	55b181bf26516d8a3b4da4e358150dcb4c6612ac
#102954	cff3b71dd462bf98d36fee433a7197b3181015e8
#102884	19f8dcb7903d688f0108522c207de9972247d55c
#102773	1e9a8204d52a07cea18ef43be4d489c0a989556d

previous master: b15e2c129e

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-10-15T14:50:14Z

Finished benchmarking commit (c93ef33): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

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)	3.0%	[3.0%, 3.0%]	1
Regressions ❌ (secondary)	2.8%	[2.2%, 3.4%]	9
Improvements ✅ (primary)	-2.6%	[-2.6%, -2.6%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.2%	[-2.6%, 3.0%]	2

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)	3.1%	[3.1%, 3.1%]	1
Improvements ✅ (primary)	-2.6%	[-2.6%, -2.6%]	1
Improvements ✅ (secondary)	-2.3%	[-2.4%, -2.1%]	2
All ❌✅ (primary)	-2.6%	[-2.6%, -2.6%]	1

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

rust-timer · 2022-10-15T17:35:03Z

Finished benchmarking commit (c93ef33): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

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)	3.0%	[3.0%, 3.0%]	1
Regressions ❌ (secondary)	2.8%	[2.2%, 3.4%]	9
Improvements ✅ (primary)	-2.6%	[-2.6%, -2.6%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.2%	[-2.6%, 3.0%]	2

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)	3.1%	[3.1%, 3.1%]	1
Improvements ✅ (primary)	-2.6%	[-2.6%, -2.6%]	1
Improvements ✅ (secondary)	-2.3%	[-2.4%, -2.1%]	2
All ❌✅ (primary)	-2.6%	[-2.6%, -2.6%]	1

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

joboet and others added 22 commits October 6, 2022 22:46

std: use semaphore for thread parking on Apple platforms

99182dd

std: add thread parking tests

0ad4dd4

std: remove unused linker attribute

b4c8a7b

std: do not use dispatch semaphore under miri (yet)

c320ab9

Let chains should still drop temporaries

ad8b242

by the end of the condition's execution

resolve: Add some asserts for unexpected lifetime rib combinations

e8a6e60

resolve: Remove redundant item lifetime ribs

e94ec30

and cleanup lifetime rib walking loops

resolve: Regroup lifetime rib kinds to account for their purpose

f634106

Lower condition directly from AST to HIR

709a08a

Validate MIR in the drop_order test

4e1c09d

check if the self type is ty::Float before getting second substs

b841848

normalize stderr

5378677

Add missing checks for doc(cfg_hide(...)) attribute

f528414

Add UI test for invalid doc(cfg_hide(...)) attributes

6f0c247

remove no_core feature

062ea9c

Rollup merge of rust-lang#102884 - petrochenkov:liferib, r=cjgillot

39ff2a6

resolve: Some cleanup, asserts and tests for lifetime ribs Follow up to rust-lang#98279 and friends. r? ``@cjgillot``

Rollup merge of rust-lang#103003 - TaKO8Ki:fix-102989, r=compiler-errors

65dca11

Fix `suggest_floating_point_literal` ICE Fixes rust-lang#102989

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

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 15, 2022

bors merged commit c93ef33 into rust-lang:master Oct 15, 2022

rustbot added this to the 1.66.0 milestone Oct 15, 2022

bors mentioned this pull request Oct 15, 2022

errors: generate typed identifiers in each crate #103042

Merged

2 tasks

This was referenced Jan 7, 2024

ICE with dyn* and method that takes self by value #119694

Open

ICE with dyn* when trait is implemented for union #119695

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 6 pull requests #103083

Rollup of 6 pull requests #103083

Dylan-DPC commented Oct 15, 2022

Dylan-DPC commented Oct 15, 2022

bors commented Oct 15, 2022

bors commented Oct 15, 2022

bors commented Oct 15, 2022

rust-timer commented Oct 15, 2022

rust-timer commented Oct 15, 2022

rust-timer commented Oct 15, 2022

Rollup of 6 pull requests #103083

Rollup of 6 pull requests #103083

Conversation

Dylan-DPC commented Oct 15, 2022

Dylan-DPC commented Oct 15, 2022

bors commented Oct 15, 2022

bors commented Oct 15, 2022

bors commented Oct 15, 2022

rust-timer commented Oct 15, 2022

rust-timer commented Oct 15, 2022

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

rust-timer commented Oct 15, 2022

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Footnotes