Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rollup of 5 pull requests #131022

Merged
merged 15 commits into from
Sep 29, 2024
Merged

Rollup of 5 pull requests #131022

merged 15 commits into from
Sep 29, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

GuillaumeGomez and others added 15 commits September 28, 2024 18:38
@GuillaumeGomez
Rename standalone doctest attribute into standalone-crate
cdf2a8f
@GuillaumeGomez
Improve code for codeblock invalid attributes
35f24d0
@GuillaumeGomez
Add warning if standalone-crate is mistyped
0956f69
@GuillaumeGomez
Add regression tests for mistyped standalone-crate attribute
84d41e2
@GuillaumeGomez
Improve mistyped docblock attribute warning messages
632fed8
cargo update
bfc9951 
     Locking 5 packages to latest compatible versions
    Updating autocfg v1.3.0 -> v1.4.0
    Updating flate2 v1.0.33 -> v1.0.34
    Updating portable-atomic v1.8.0 -> v1.9.0
    Updating syn v2.0.77 -> v2.0.79
    Updating tempfile v3.12.0 -> v3.13.0
note: pass `--verbose` to see 81 unchanged dependencies behind latest

library dependencies:
     Locking 0 packages to latest compatible versions
note: pass `--verbose` to see 9 unchanged dependencies behind latest

rustbook dependencies:
     Locking 13 packages to latest compatible versions
    Updating autocfg v1.3.0 -> v1.4.0
    Updating cc v1.1.21 -> v1.1.22
    Updating flate2 v1.0.33 -> v1.0.34
    Updating libc v0.2.158 -> v0.2.159
    Updating pkg-config v0.3.30 -> v0.3.31
    Updating redox_syscall v0.5.4 -> v0.5.6
    Updating serde_spanned v0.6.7 -> v0.6.8
    Updating syn v2.0.77 -> v2.0.79
    Updating tempfile v3.12.0 -> v3.13.0
    Updating thiserror v1.0.63 -> v1.0.64
    Updating thiserror-impl v1.0.63 -> v1.0.64
    Updating toml_edit v0.22.21 -> v0.22.22
    Updating winnow v0.6.18 -> v0.6.20
note: pass `--verbose` to see 30 unchanged dependencies behind latest
@matthiaskrgr
cleanup: don't .into() identical types
e963568
@matthiaskrgr
cleanup: don't manually unwrap_or_default()
1a28599
@GuillaumeGomez
Rename doctest attribute standalone-crate into standalone_crate f…
6f5f21a 
…or coherency
@matthiaskrgr
cleanup: don't clone types that are Copy
71cd918
@matthiaskrgr
Rollup merge of rust-lang#130931 - GuillaumeGomez:standalone-crate, r…
3097951 
…=notriddle

Rename `standalone` doctest attribute into `standalone_crate`

Following [zulip discussion](https://rust-lang.zulipchat.com/#narrow/stream/266220-t-rustdoc/topic/Renaming.20code.20block.20.22standalone.22.20attribute.3F) and poll results.

r? `@notriddle`
@matthiaskrgr
Rollup merge of rust-lang#131000 - rust-lang:cargo_update, r=clubby789
4bb9259 
Weekly `cargo update`

Automation to keep dependencies in `Cargo.lock` current.

The following is the output from `cargo update`:

```txt
     Locking 5 packages to latest compatible versions
    Updating autocfg v1.3.0 -> v1.4.0
    Updating flate2 v1.0.33 -> v1.0.34
    Updating portable-atomic v1.8.0 -> v1.9.0
    Updating syn v2.0.77 -> v2.0.79
    Updating tempfile v3.12.0 -> v3.13.0
note: pass `--verbose` to see 81 unchanged dependencies behind latest

library dependencies:
     Locking 0 packages to latest compatible versions
note: pass `--verbose` to see 9 unchanged dependencies behind latest

rustbook dependencies:
     Locking 13 packages to latest compatible versions
    Updating autocfg v1.3.0 -> v1.4.0
    Updating cc v1.1.21 -> v1.1.22
    Updating flate2 v1.0.33 -> v1.0.34
    Updating libc v0.2.158 -> v0.2.159
    Updating pkg-config v0.3.30 -> v0.3.31
    Updating redox_syscall v0.5.4 -> v0.5.6
    Updating serde_spanned v0.6.7 -> v0.6.8
    Updating syn v2.0.77 -> v2.0.79
    Updating tempfile v3.12.0 -> v3.13.0
    Updating thiserror v1.0.63 -> v1.0.64
    Updating thiserror-impl v1.0.63 -> v1.0.64
    Updating toml_edit v0.22.21 -> v0.22.22
    Updating winnow v0.6.18 -> v0.6.20
note: pass `--verbose` to see 30 unchanged dependencies behind latest
```
@matthiaskrgr
Rollup merge of rust-lang#131011 - matthiaskrgr:no_into, r=jieyouxu
128a7d6 
cleanup: don't `.into()` identical types
@matthiaskrgr
Rollup merge of rust-lang#131013 - matthiaskrgr:unwrapordefault, r=ji…
af1e24b 
…eyouxu

cleanup: don't manually `unwrap_or_default()`
@matthiaskrgr
Rollup merge of rust-lang#131014 - matthiaskrgr:no_clone_on_copy, r=c…
71c96cc 
…henyukang

cleanup: don't clone types that are Copy
@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Sep 29, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Sep 29, 2024

📌 Commit 71c96cc has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors 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 Sep 29, 2024
@bors
Copy link
Contributor

bors commented Sep 29, 2024

⌛ Testing commit 71c96cc with merge 42ff2ee...

@bors
Copy link
Contributor

bors commented Sep 29, 2024

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 42ff2ee to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 29, 2024
@bors bors merged commit 42ff2ee into rust-lang:master Sep 29, 2024
7 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Sep 29, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#130931 Rename standalone doctest attribute into `standalone_crat… fe6fce222420306e9d57a062319a246747d969cd (link)
#131000 Weekly cargo update 412523028cf8476c3ec90926a669459142bc4667 (link)
#131011 cleanup: don't .into() identical types d5c429905ac40f6e30416314599c3c21afd39119 (link)
#131013 cleanup: don't manually unwrap_or_default() 5c43e5ab09ecb58f3d68f55df1fa020f23d77fab (link)
#131014 cleanup: don't clone types that are Copy 0a7caccbf1f24ac7e7a63d576112272e370a310f (link)

previous master: d194948e50

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
Copy link
Collaborator

Finished benchmarking commit (42ff2ee): 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 -1.3%)

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)		 -1.3% [-1.7%, -1.0%] 5
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -1.3% [-1.7%, -1.0%] 5

Cycles

Results (secondary 2.9%)

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

Binary size

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

Bootstrap: 767.592s -> 768.244s (0.08%)
Artifact size: 341.37 MiB -> 341.41 MiB (0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-run-make Area: port run-make Makefiles to rmake.rs merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.83.0
Development

Successfully merging this pull request may close these issues.
5 participants
@matthiaskrgr @bors @rust-timer @rustbot @GuillaumeGomez