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.

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

Rollup of 9 pull requests #109015

Merged
merged 23 commits into from
Mar 11, 2023
Merged

Rollup of 9 pull requests #109015

merged 23 commits into from
Mar 11, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Sp00ph and others added 23 commits January 31, 2023 15:04
This is fixed by simply using the currently registered target in the
current session. We need to use it because of target json that are not
by design included in the rustc list of targets.
Move __thread_local_inner macro in crate::thread::local to crate::sys.
Currently, the tidy check does not fail for `library/std/src/thread/local.rs` even though it contains platform specific code. This is beacause target_family did not exist at the time the tidy checks were written [1].

[1]: rust-lang#105861 (comment)

Signed-off-by: Ayush Singh <[email protected]>
Split the __thread_local_inner macro to make it more readable. Also move
everything to crate::sys::common::thread_local.

Signed-off-by: Ayush Singh <[email protected]>
The current error message is _really_ confusing.
This allows removing all the platform-dependent code from `library/std/src/thread/local.rs` and `library/std/src/thread/mod.rs`

Signed-off-by: Ayush Singh <[email protected]>
serialize `q` (`itemPaths`) sparsely
overall 4% reduction in search index size
Fix `vec_deque::Drain` FIXME

In my original `VecDeque` rewrite, I didn't use `VecDeque::slice_ranges` in `Drain::as_slices`, even though that's basically the exact use case for `slice_ranges`. The reason for this was that a `VecDeque` wrapped in a `Drain` actually has its length set to `drain_start`, so that there's no potential use after free if you `mem::forget` the `Drain`. I modified `slice_ranges` to accept an explicit `len` parameter instead, which it now uses to bounds check the given range. This way, `Drain::as_slices` can use `slice_ranges` internally instead of having to basically just copy paste the `slice_ranges` code. Since `slice_ranges` is just an internal helper function, this shouldn't change the user facing behavior in any way.
…=jsha

rustdoc: sort deprecated items lower in search

closes rust-lang#98759

### Screenshots

`i32::MAX` show sup above `std::i32::MAX` and `core::i32::MAX`
![image](https://user-images.githubusercontent.com/803701/216725619-40afb7b0-e984-4a2e-ab5b-a95b24736b0e.png)
If just searching for `min`, the deprecated results show up far below other things:
![image](https://user-images.githubusercontent.com/803701/216725672-e4325d37-9bfe-47eb-a1fe-0e57092aa811.png)
one page later
![image](https://user-images.githubusercontent.com/803701/216725932-cd1c4a42-d527-44fb-a4ab-5a6d243659cc.png)

~~And, as you can see, the "Deprecation planned" message shows up in the search results. The same is true for fully-deprecated items like `mem::uninitialized`:
![image](https://user-images.githubusercontent.com/803701/216726268-1657e77a-563f-45a0-85a7-3a0cf4d66d6f.png)~~

Edit: the deprecation message change was removed from this PR. Only the sorting is changed.
Add note when matching token with nonterminal

The current error message is _really_ confusing. The implementation is slightly hacky, but not that much more hacky than all this nonterminal stuff..

r? ``@petrochenkov``
…,jsha,GuillaumeGomez

rustdoc: Migrate `document_item_info` to Askama

https://rust-lang.zulipchat.com/#narrow/stream/266220-rustdoc/topic/rustdoc.20allocations.20are.20slow

Hoping to piece-by-piece migrate things to template. Had a few failed attempts at more complex parts of the code, so this is just a start.
…uillaumeGomez

rustdoc: Migrate sidebar rendering to Askama

cc rust-lang#108757

Renders the sidebar for documentation using an Askama template
…bilee

Move __thread_local_inner to sys

Move `__thread_local_inner` macro in `crate::thread::local` to `crate::sys`. Initially, I was thinking about removing this macro completely, but I could not find a way to create the generic statics without macros, so in the end, I just moved to code around.

This probably will need a rebase once rust-lang#108917 is merged

r? ``@workingjubilee``
…-obk

Honor current target when checking conditional compilation values

This is fixed by simply using the currently registered target in the current session. We need to use it because of target json that are not by design included in the rustc list of targets.

Fixes rust-lang#108941
…errors

Directly construct Inherited in typeck.

Using `InheritedBuilder` + a closure does not seem necessary any more.

+ a few opportunistic simplifications to typeck entry point.
… r=petrochenkov

rustdoc: Don't crash on `crate` references in blocks

This is a regression from rust-lang#94857.
@rustbot 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-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 Mar 11, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=9

@bors
Copy link
Contributor

bors commented Mar 11, 2023

📌 Commit e12ba73 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 Mar 11, 2023
@bors
Copy link
Contributor

bors commented Mar 11, 2023

⌛ Testing commit e12ba73 with merge 48f048a53d955eeb5b449d86d645fcaecbf39c73...

@bors
Copy link
Contributor

bors commented Mar 11, 2023

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 11, 2023
@matthiaskrgr
Copy link
Member Author

@bors retry
failed to get successful HTTP response from [https://index.crates.io/3/r/rgb](https://index.crates.io/3/r/rgb%60), got 503

@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 Mar 11, 2023
@bors
Copy link
Contributor

bors commented Mar 11, 2023

⌛ Testing commit e12ba73 with merge 67e1681...

@bors
Copy link
Contributor

bors commented Mar 11, 2023

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 67e1681 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 11, 2023
@bors bors merged commit 67e1681 into rust-lang:master Mar 11, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 11, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (67e1681): 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)
-1.0% [-1.0%, -1.0%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -1.0% [-1.0%, -1.0%] 1

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.0% [1.1%, 2.9%] 4
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.0% [-3.3%, -2.6%] 2
All ❌✅ (primary) - - 0

Cycles

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

@rust-log-analyzer
Copy link
Collaborator

The job dist-x86_64-linux-alt failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
    Updating crates.io index
    Updating git repository `https://github.com/rust-lang/measureme`
    Updating git repository `https://github.com/rust-lang/team`
    Updating git repository `https://github.com/rust-lang/measureme`
warning: spurious network error (2 tries remaining): failed to get successful HTTP response from `https://index.crates.io/3/r/rgb`, got 503


warning: spurious network error (1 tries remaining): failed to get successful HTTP response from `https://index.crates.io/3/r/rgb`, got 503


error: failed to get `rgb` as a dependency of package `inferno v0.10.6`
    ... which satisfies dependency `inferno = "^0.10"` (locked to 0.10.6) of package `site v0.1.0 (/tmp/tmp-multistage/opt-artifacts/rustc-perf/site)`
Caused by:
  failed to query replaced source registry `crates-io`

Caused by:
Caused by:
  download of 3/r/rgb failed
Caused by:
Caused by:
  failed to get successful HTTP response from `https://index.crates.io/3/r/rgb`, got 503
stage-build DEBUG: Reverting working dir to `/checkout/obj`
stage-build ERROR: The multi-stage build has failed
stage-build INFO: Timer results
-----------------------------------------
-----------------------------------------
                                         
Total duration:                        0s
-----------------------------------------
root INFO: Free disk space: 601.22 GiB out of total 666.61 GiB (9.81% used)
Traceback (most recent call last):
  File "../src/ci/stage-build.py", line 839, in <module>
    raise e
  File "../src/ci/stage-build.py", line 836, in <module>
    execute_build_pipeline(timer, pipeline, build_args)
  File "../src/ci/stage-build.py", line 752, in execute_build_pipeline
    pipeline.build_rustc_perf()
  File "../src/ci/stage-build.py", line 145, in build_rustc_perf
    RUSTC_BOOTSTRAP="1"
  File "../src/ci/stage-build.py", line 452, in cmd
    return subprocess.run(args, env=environment, check=True)
  File "/usr/lib64/python3.6/subprocess.py", line 438, in run
    output=stdout, stderr=stderr)
subprocess.CalledProcessError: Command '['/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo', 'build', '-p', 'collector']' returned non-zero exit status 101.

@matthiaskrgr matthiaskrgr deleted the rollup-xu2s31g branch March 16, 2024 18:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc 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
Development

Successfully merging this pull request may close these issues.