Rollup of 13 pull requests by JohnTitor · Pull Request #106833 · rust-lang/rust

JohnTitor · 2023-01-14T03:04:38Z

Successful merges:

reword Option::as_ref and Option::map examples #104965 (reword Option::as_ref and Option::map examples)
Added error documentation for write_fmt #105172 (Added error documentation for write_fmt)
rustdoc: fix outdated lint section of the book #106605 (rustdoc: fix outdated lint section of the book)
Check compiler docs in PR CI #106670 (Check compiler docs in PR CI)
mv binary_heap.rs binary_heap/mod.rs #106692 (mv binary_heap.rs binary_heap/mod.rs)
rustdoc: rename CSS rustdoc-toggle -> toggle and toggle -> settings-toggle #106693 (rustdoc: rename CSS rustdoc-toggle -> toggle and toggle -> settings-toggle)
Remove duplicate sha-1 dependency #106707 (Remove duplicate sha-1 dependency)
Add AtomicPtr::as_mut_ptr #106762 (Add AtomicPtr::as_mut_ptr)
Remove dead code in rustdoc stripper #106766 (Remove dead code in rustdoc stripper)
Remove stale reference to the test suite location #106775 (Remove stale reference to the test suite location)
Stop having unused lifetimes on some impls #106799 (Stop having unused lifetimes on some impls)
Update rental hack to work with remapped paths. #106816 (Update rental hack to work with remapped paths.)
rustdoc: remove unnecessary DOM class h1.fqn #106819 (rustdoc: remove unnecessary DOM class h1.fqn)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

This continuation of work at rust-lang#98861

It's misleading. The main heading sometimes isn't an fully qualified name at all. It's also redundant. It's always a child of `div.main-heading`, so just use that.

…oggle This swaps things around so that the class that gets used more often has the shorter name.

…scottmcm reword Option::as_ref and Option::map examples The description for the examples of `Option::as_ref` and `Option::map` imply that the example is only doing type conversion, when it is actually finding the length of a string. Changes the wording to imply that some operation is being run on the value contained in the `Option` closesrust-lang#104476

…cottmcm Added error documentation for write_fmt This continuation of work at rust-lang#98861

…ook, r=GuillaumeGomez rustdoc: fix outdated lint section of the book

…, r=Mark-Simulacrum Check compiler docs in PR CI Fixesrust-lang#106624

…ap/mod.rs, r=Mark-Simulacrum mv binary_heap.rs binary_heap/mod.rs I confess this request is somewhat selfish, as it's made in order to ease synchronisation with my [copse](https://crates.io/crates/copse) crate (see eggyal/copse#6 for explanation). I wholly understand that such grounds may be insufficient to justify merging this request—but no harm in asking, right?

…r=GuillaumeGomez rustdoc: rename CSS rustdoc-toggle -> toggle and toggle -> settings-toggle This swaps things around so that the class that gets used more often has the shorter name.

…mulacrum Remove duplicate sha-1 dependency [`sha-1`](https://crates.io/crates/sha-1) is more or less a duplicate of [`sha1`](https://crates.io/crates/sha1). The `sha-1` is deprecated and no longer updated. This updates the dependencies to use the new name. Some other dependencies that got updated as a consequence: * The updated pest dependencies are currently only used by mdbook, and shouldn't have any issues. * ucd-trie 0.1.3 to 0.1.5: No changelog, but looks like some tables were updated for new unicode versions: https://github.com/BurntSushi/ucd-generate/commits/master/ucd-trie. This is only used by pest (and thus mdbook). * thiserror 1.33 to 1.38: Nothing significant in the notes at https://github.com/dtolnay/thiserror/releases.

… r=m-ou-se Add `AtomicPtr::as_mut_ptr` See rust-lang#66893 (comment) r? thomcc

…de, r=notriddle Remove dead code in rustdoc stripper No changes when this code is removed. cc `@aDotInTheVoid` r? `@notriddle`

…ulacrum Remove stale reference to the test suite location

…=cuviper Stop having unused lifetimes on some `impl`s See <https://doc.rust-lang.org/nightly/std/cmp/trait.PartialOrd.html#impl-PartialOrd%3COsStr%3E-for-PathBuf>, where these lifetimes show up even though they're not needed: ![image](https://user-images.githubusercontent.com/18526288/212257802-da275167-38f9-4e2c-aafc-d44f0fc6a7c6.png) With this PR, the unneeded lifetimes are no longer there: ![image](https://user-images.githubusercontent.com/18526288/212257938-0097c4bf-1247-4c91-8445-5bf0dde1b501.png)

Update `rental` hack to work with remapped paths. This PR simply switches to an already-existing helper instead of hard-coding a specific enum variant. The new revision of the test fails without the other changes in this PR. Context: I'm exploring running UI tests with remapped paths by default in rust-lang#105924 and the rental test was one of the ones that failed. This may also be useful in the context of rust-lang/rfcs#3127 ("New rustc and Cargo options to allow path sanitisation by default").

…uillaumeGomez rustdoc: remove unnecessary DOM class `h1.fqn` It's misleading. The main heading sometimes isn't an fully qualified name at all. It's also redundant. It's always a child of `div.main-heading`, so just use that.

JohnTitor · 2023-01-14T03:05:42Z

@bors r+ p=13 rollup=never

bors · 2023-01-14T03:05:44Z

📌 Commit caa1d47 has been approved by JohnTitor

It is now in the queue for this repository.

bors · 2023-01-14T05:51:59Z

⌛ Testing commit caa1d47 with merge c0b8735...

bors · 2023-01-14T08:32:38Z

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing c0b8735 to master...

rust-timer · 2023-01-14T08:36:16Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#106819	ae0401ea84c0de30c69d8709f3d1d53bcb221e92
#106816	21e8e2038ab5c088faec343c9d73e4bbfad49886
#106799	7bc20038528a2fc478ad8a5043e313f2a5d25dd7
#106775	3a8e4e32372105ca06a7b9d2a436b09e479c2647
#106766	d9cd1c43f8d916ee92334a478d6a5e5730a0d91f
#106762	580b2824c6ecc2aedb40f16ab2a34837493b5363
#106707	cf4ccf1fd06352b5aae25cd95f7eeaf16c9a1dae
#106693	c08b0a764acfea6541da9eaa47c64ee05219af80
#106692	8ace7f784c10a7244871707022f601b6af343d28
#106670	9945f562d82404b6a99ea951b3e9911852ebb44d
#106605	6ed79ac6393478e97cfa18a2b8cbf4b336b8ae57
#105172	99d1f180ae26a8e6ebced10847cd44c1c8d399c5
#104965	76d3d9de834df00fbe35ea07d5b7ac97ce39b469

previous master: e9e0908367

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-01-14T09:50:18Z

Finished benchmarking commit (c0b8735): comparison URL.

Overall result: ❌ regressions - 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)	1.3%	[1.3%, 1.3%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

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)	2.2%	[2.2%, 2.2%]	1
Regressions ❌ (secondary)	1.1%	[1.1%, 1.1%]	1
Improvements ✅ (primary)	-1.1%	[-1.1%, -1.1%]	1
Improvements ✅ (secondary)	-4.0%	[-4.0%, -4.0%]	1
All ❌✅ (primary)	0.6%	[-1.1%, 2.2%]	2

Cycles

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

zacklukemand others added 29 commits November 26, 2022 15:41

reword Option::as_ref and Option::map examples
74e7709

add link for string to as_ref docs
123e203

Added error documentation for write_fmt
c466be0
This continuation of work at rust-lang#98861

rustdoc: fix outdated lint section of the book
6dd1086

Check compiler docs in PR CI
1300c8d

mv binary_heap.rs binary_heap/mod.rs
1a87ed9

Remove duplicate sha-1 dependency
bb60a76

Add AtomicPtr::as_mut_ptr
a513c84

Remove unused mut from a doctest
f1a63bc

Make // SAFETY comment part of the doctest, and not surrounding code
22b4c68

Remove dead code in rustdoc stripper
0482a48

Stop having unused lifetimes on some impls
4949fb0

Remove stale reference to the test suite location
184057b

rustdoc: remove unnecessary DOM class h1.fqn
39b90a5
It's misleading. The main heading sometimes isn't an fully qualified name at all. It's also redundant. It's always a child of `div.main-heading`, so just use that.

rustdoc: rename CSS rustdoc-toggle -> toggle and toggle -> settings-t…
1d328de
…oggle This swaps things around so that the class that gets used more often has the shorter name.

Update rental hack to work with remapped paths.
496edf9

Rollup merge ofrust-lang#105172- alexs-sh:issue-98861-fix-next, r=s…
6d8ac83
…cottmcm Added error documentation for write_fmt This continuation of work at rust-lang#98861

Rollup merge ofrust-lang#106605- notriddle:notriddle/outdated-rustb…
b6b4429
…ook, r=GuillaumeGomez rustdoc: fix outdated lint section of the book

Rollup merge ofrust-lang#106670- albertlarsan68:check-docs-in-pr-ci…
233169f
…, r=Mark-Simulacrum Check compiler docs in PR CI Fixesrust-lang#106624

Rollup merge ofrust-lang#106693- notriddle:notriddle/toggle-trunc, …
1584667
…r=GuillaumeGomez rustdoc: rename CSS rustdoc-toggle -> toggle and toggle -> settings-toggle This swaps things around so that the class that gets used more often has the shorter name.

Rollup merge ofrust-lang#106762- WaffleLapkin:atomicptr+as_mut_ptr,…
9b502a4
… r=m-ou-se Add `AtomicPtr::as_mut_ptr` See rust-lang#66893 (comment) r? thomcc

Rollup merge ofrust-lang#106766- GuillaumeGomez:rm-stripper-dead-co…
96d4d49
…de, r=notriddle Remove dead code in rustdoc stripper No changes when this code is removed. cc `@aDotInTheVoid` r? `@notriddle`

Rollup merge ofrust-lang#106775- albertlarsan68:patch-1, r=Mark-Sim…
5ff2867
…ulacrum Remove stale reference to the test suite location

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

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 Jan 14, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 14, 2023

bors merged commit c0b8735 into rust-lang:masterJan 14, 2023

rustbot added this to the 1.68.0 milestone Jan 14, 2023

JohnTitor deleted the rollup-z8398jk branch January 14, 2023 08:35

Navigation Menu

Uh oh!

Uh oh!

Rollup of 13 pull requests - #106833

Rollup of 13 pull requests#106833
bors merged 29 commits into
rust-lang:masterfrom
JohnTitor:rollup-z8398jk

JohnTitor commented Jan 14, 2023

Uh oh!

JohnTitor commented Jan 14, 2023

Uh oh!

bors commented Jan 14, 2023

Uh oh!

bors commented Jan 14, 2023

Uh oh!

bors commented Jan 14, 2023

Uh oh!

rust-timer commented Jan 14, 2023

Uh oh!

rust-timer commented Jan 14, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

14 participants

Uh oh!

Uh oh!

Conversation

JohnTitor commented Jan 14, 2023

Uh oh!

JohnTitor commented Jan 14, 2023

Uh oh!

bors commented Jan 14, 2023

Uh oh!

bors commented Jan 14, 2023

Uh oh!

bors commented Jan 14, 2023

Uh oh!

rust-timer commented Jan 14, 2023

Uh oh!

rust-timer commented Jan 14, 2023

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

14 participants