Move some things to std::sync::poison and reexport them in std::sync

[GrigorenkoPV]

Tracking issue: #134646

r? @tgross35

I've used sync_poison_mod feature flag instead, because sync_poison had already been used back in 1.2.

try-job: x86_64-msvc

[tgross35]

Could this skip just get applied to specific blocks, like in https://github.com/rust-lang/rust/blob/addbd001ec56741829f20a3000892f8620dd0843/library/core/src/unicode/mod.rs? Applying to the whole file would probably make it a bit too easy for things to get messy.

[GrigorenkoPV]

Then pretty much every block of uses would have to be annotated, because otherwise rustfmt will regroup them.

IMO this looks even noisier and less accurate with all the additional attributes and inability to leave two blank lines between the groups (rustfmt removes double empty lines).

[tgross35]

Alright, the blank line section breaks are fine but could you remove the double blank lines since rustfmt doesn't do those anywhere? I.e. \n\n\n -> \n\n.

[tgross35]

I don't think this plays with rustdoc nicely. Searching for Mutex now gives the absolute std::sync::poison::Mutex path, where it has an "unstable" mark. But if you open it in std::sync::Mutex, it is fine.

These should probably be marked doc(inline) for now. But @rust-lang/rustdoc is there something we can do better for stable types reexported from unstable modules? This is also a problem for other types too, e.g. FromBytesUntilNulError looks like it is unstable because it got moved from core::ffi to core::ffi::c_str.

Edit: opened #134702

[GrigorenkoPV]

These should probably be marked doc(inline) for now.

Done. This helped with the search, but not with the things like MutexGuard's doc's reference to Mutex::lock being converted to the absolute (unstable) std::sync::poison::Mutex path.

[tgross35]

I am not sure what you mean, could you post a screenshot (edit: on the rustdoc issue, #134702)? Unfortunately we probably should wait on a Rustdoc fix then, this would be a lot of API to have misleading documentation.

[tgross35]

We are at least two years off from an edition where we would change these defaults, so I don't think this needs to be addressed at this point. Just reexporting from self::poison should be fine, things might change between now and the next edition.

[GrigorenkoPV]

#134702 got closed, but #134702 (comment) is still a problem.
I guess we can manually qualify all the links in docs to lead to std::sync::* until the std::sync::poison module is stabilized, but that sounds a bit suboptimal.

[tgross35]

It seems like the rustdoc output should be fixed with #134806, could you double check?

With that the only remaining thing is to drop default_poison_flavor #134692 (comment) and the small style nit above, rest lgtm.

@rustbot author

[GrigorenkoPV]

It seems like the rustdoc output should be fixed with #134806, could you double check?

Yes, works fine now.

With that the only remaining thing is to drop default_poison_flavor #134692 (comment)

Done.

and the small style nit above

Done

[tgross35]

Thanks!

@bors r+

[bors]

📌 Commit 2ff5393 has been approved by tgross35

It is now in the queue for this repository.

[bors]

⌛ Testing commit dd99d4c with merge e3acb18...

[bors]

💔 Test failed - checks-actions

[GrigorenkoPV]

I was not able to run debuginfo tests locally (they failed, maybe due to llvm version mismatch or something else, no idea), so I tried blessing them blindly and ended up adding an extra ::poison::. I removed it now. Hopefully, now it'll work.

[notriddle]

@bors r=tgross35

[bors]

📌 Commit ee2ad4d has been approved by tgross35

It is now in the queue for this repository.

[tgross35]

@bors rollup=iffy

[bors]

⌛ Testing commit ee2ad4d with merge ac00fe8...

[bors]

☀️ Test successful - checks-actions
Approved by: tgross35
Pushing ac00fe8 to master...

[rust-timer]

Finished benchmarking commit (ac00fe8): 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 (primary -4.1%, secondary -3.8%)

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

Cycles

Results (primary -3.0%)

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

Binary size

Results (primary 0.0%, secondary 0.0%)

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.0%	[0.0%, 0.1%]	23
Regressions ❌ (secondary)	0.0%	[0.0%, 0.0%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.0%	[0.0%, 0.1%]	23

Bootstrap: 763.847s -> 763.746s (-0.01%)
Artifact size: 325.57 MiB -> 325.60 MiB (0.01%)