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 7 pull requests #110271

Closed
wants to merge 19 commits into from
Closed

Rollup of 7 pull requests #110271

wants to merge 19 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

joshtriplett and others added 19 commits April 10, 2023 17:24
@joshtriplett
Stabilize IsTerminal
afd45c2 
closes: rust-lang#98070
@compiler-errors
Erase lifetimes above ty::INNERMOST when probing ambiguous types
5eb0528
@lcnr
region error cleanup
a19adef 
- require `TypeErrCtxt` to always result in an error
- move `resolve_regions_and_report_errors` to the `ObligationCtxt`
- merge `process_registered_region_obligations` into `resolve_regions`
@lcnr
#[must_use] for fns returning a list of errors
cc82ccb
@marc0246
Fix btree CursorMut::insert_after check
cdd9829
@lcnr
fix comment
c0d3d32
@kayagokalp
fix: use --retry-all-errors instead of --retry in curl invocations of…
b065eef 
… bootstrap download
@justincredible
Update unwind_safe.rs
9b0ceb4 
Typo in the documentation.
@nnethercote
Make Region::as_var infallible.
c802694 
It's what all the call sites require.
@nnethercote
Remove impl ToRegionVid for RegionVid.
411422f 
It's weird and unnecessary.
@nnethercote
Remove ToRegionVid.
bbc4009 
It is only implemented for `Region`, where it is equivalent to the
inherent `as_var` method.
@nnethercote
Remove some unused type folders.
72605cd 
I'm surprised the compiler doesn't warn about these. It appears having
an `impl` on a struct is enough to avoid a warning about it never being
constructed.
@matthiaskrgr
Rollup merge of rust-lang#110072 - joshtriplett:stabilize-is-terminal…
d51758d 
…, r=Mark-Simulacrum

Stabilize IsTerminal

FCP completed in rust-lang#98070 .

closes: rust-lang#98070
@matthiaskrgr
Rollup merge of rust-lang#110195 - compiler-errors:issue-110052, r=al…
5a74d56 
…iemjay

Erase lifetimes above `ty::INNERMOST` when probing ambiguous types

Turns out that `TyCtxt::replace_escaping_bound_vars_uncached` only erases bound vars exactly at `ty::INNERMOST`, and not everything above. This regresses the suggestions for non-lifetime binders, but oh well, I don't really care about those.

Fixes rust-lang#110052
@matthiaskrgr
Rollup merge of rust-lang#110218 - nnethercote:rm-ToRegionVid, r=comp…
91c362d 
…iler-errors

Remove `ToRegionVid`

r? ``@compiler-errors``
@matthiaskrgr
Rollup merge of rust-lang#110220 - lcnr:regionzz, r=compiler-errors
9403646 
cleanup our region error API

- require `TypeErrCtxt` to always result in an error, closing rust-lang#108810
- move `resolve_regions_and_report_errors` to the `ObligationCtxt`
- call `process_registered_region_obligations` in `resolve_regions`
- move `resolve_regions` into the `outlives` submodule
- add `#[must_use]` to functions returning lists of errors

r? types
@matthiaskrgr
Rollup merge of rust-lang#110234 - marc0246:btree-insert-after-fix, r…
5576c94 
…=cuviper

Fix btree `CursorMut::insert_after` check

Fixes a check inside `BTreeMap`'s `CursorMut::insert_after`, where it would peek the previous element to check whether the inserted key is below the next one, instead of peeking the next element.
@matthiaskrgr
Rollup merge of rust-lang#110245 - kayagokalp:kayagokalp/110178, r=oz…
2585de5 
…kanonur

fix: use `--retry-all-errors` instead of `--retry` in curl invocations of bootstrap download

closes rust-lang#110178.
@matthiaskrgr
Rollup merge of rust-lang#110262 - justincredible:patch-1, r=ChrisDenton
11d5e5d 
Update unwind_safe.rs

Typo in the documentation.
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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 Apr 13, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Contributor

bors commented Apr 13, 2023

📌 Commit 11d5e5d 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 Apr 13, 2023
@bors
Copy link
Contributor

bors commented Apr 13, 2023

⌛ Testing commit 11d5e5d with merge c99a48f10b979e68d6ad1cec786d55e530faa0c4...

@bors
Copy link
Contributor

bors commented Apr 13, 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 Apr 13, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Apr 13, 2023
Closed
@rust-log-analyzer
Copy link
Collaborator

The job aarch64-gnu failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
configure: 
configure: run `python /checkout/x.py --help`
Attempting with retry: make prepare
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
curl: option --retry-all-errors: is unknown
curl: try 'curl --help' or 'curl --manual' for more information
spurious failure, trying again
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
curl: option --retry-all-errors: is unknown
curl: try 'curl --help' or 'curl --manual' for more information
spurious failure, trying again
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
curl: option --retry-all-errors: is unknown
curl: try 'curl --help' or 'curl --manual' for more information
spurious failure, trying again
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
curl: option --retry-all-errors: is unknown
curl: try 'curl --help' or 'curl --manual' for more information
spurious failure, trying again
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
curl: option --retry-all-errors: is unknown
curl: try 'curl --help' or 'curl --manual' for more information
    found:    e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
    expected: dd140223ec842ebe4c69ec6aa2966b97dacdd9ce112490e310f374134188d0c4
Traceback (most recent call last):
  File "/checkout/src/bootstrap/bootstrap.py", line 965, in <module>
  File "/checkout/src/bootstrap/bootstrap.py", line 965, in <module>
    main()
  File "/checkout/src/bootstrap/bootstrap.py", line 950, in main
    bootstrap(args)
  File "/checkout/src/bootstrap/bootstrap.py", line 914, in bootstrap
    build.download_toolchain()
  File "/checkout/src/bootstrap/bootstrap.py", line 436, in download_toolchain
    self._download_component_helper(filename, pattern, tarball_suffix)
  File "/checkout/src/bootstrap/bootstrap.py", line 468, in _download_component_helper
  File "/checkout/src/bootstrap/bootstrap.py", line 51, in get
    raise RuntimeError("failed verification")
RuntimeError: failed verification
make: *** [Makefile:58: prepare] Error 1
make: *** [Makefile:58: prepare] Error 1
Command failed. Attempt 2/5:
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
curl: option --retry-all-errors: is unknown
curl: try 'curl --help' or 'curl --manual' for more information
spurious failure, trying again
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
curl: option --retry-all-errors: is unknown
curl: try 'curl --help' or 'curl --manual' for more information
spurious failure, trying again
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
curl: option --retry-all-errors: is unknown
curl: try 'curl --help' or 'curl --manual' for more information
spurious failure, trying again
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
curl: option --retry-all-errors: is unknown
curl: try 'curl --help' or 'curl --manual' for more information
spurious failure, trying again
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
curl: option --retry-all-errors: is unknown
curl: try 'curl --help' or 'curl --manual' for more information
    found:    e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
    expected: dd140223ec842ebe4c69ec6aa2966b97dacdd9ce112490e310f374134188d0c4
Traceback (most recent call last):
  File "/checkout/src/bootstrap/bootstrap.py", line 965, in <module>
  File "/checkout/src/bootstrap/bootstrap.py", line 965, in <module>
    main()
  File "/checkout/src/bootstrap/bootstrap.py", line 950, in main
    bootstrap(args)
  File "/checkout/src/bootstrap/bootstrap.py", line 914, in bootstrap
    build.download_toolchain()
  File "/checkout/src/bootstrap/bootstrap.py", line 436, in download_toolchain
    self._download_component_helper(filename, pattern, tarball_suffix)
  File "/checkout/src/bootstrap/bootstrap.py", line 468, in _download_component_helper
  File "/checkout/src/bootstrap/bootstrap.py", line 51, in get
    raise RuntimeError("failed verification")
RuntimeError: failed verification
make: *** [Makefile:58: prepare] Error 1
make: *** [Makefile:58: prepare] Error 1
Command failed. Attempt 3/5:
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
curl: option --retry-all-errors: is unknown
curl: try 'curl --help' or 'curl --manual' for more information
spurious failure, trying again
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
curl: option --retry-all-errors: is unknown
curl: try 'curl --help' or 'curl --manual' for more information
spurious failure, trying again
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
curl: option --retry-all-errors: is unknown
curl: try 'curl --help' or 'curl --manual' for more information
spurious failure, trying again
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
curl: option --retry-all-errors: is unknown
curl: try 'curl --help' or 'curl --manual' for more information
spurious failure, trying again
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
curl: option --retry-all-errors: is unknown
curl: try 'curl --help' or 'curl --manual' for more information
    found:    e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
    expected: dd140223ec842ebe4c69ec6aa2966b97dacdd9ce112490e310f374134188d0c4
Traceback (most recent call last):
  File "/checkout/src/bootstrap/bootstrap.py", line 965, in <module>
  File "/checkout/src/bootstrap/bootstrap.py", line 965, in <module>
    main()
  File "/checkout/src/bootstrap/bootstrap.py", line 950, in main
    bootstrap(args)
  File "/checkout/src/bootstrap/bootstrap.py", line 914, in bootstrap
    build.download_toolchain()
  File "/checkout/src/bootstrap/bootstrap.py", line 436, in download_toolchain
    self._download_component_helper(filename, pattern, tarball_suffix)
  File "/checkout/src/bootstrap/bootstrap.py", line 468, in _download_component_helper
  File "/checkout/src/bootstrap/bootstrap.py", line 51, in get
    raise RuntimeError("failed verification")
RuntimeError: failed verification
make: *** [Makefile:58: prepare] Error 1
make: *** [Makefile:58: prepare] Error 1
Command failed. Attempt 4/5:
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
curl: option --retry-all-errors: is unknown
curl: try 'curl --help' or 'curl --manual' for more information
spurious failure, trying again
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
curl: option --retry-all-errors: is unknown
curl: try 'curl --help' or 'curl --manual' for more information
spurious failure, trying again
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
curl: option --retry-all-errors: is unknown
curl: try 'curl --help' or 'curl --manual' for more information
spurious failure, trying again
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
curl: option --retry-all-errors: is unknown
curl: try 'curl --help' or 'curl --manual' for more information
spurious failure, trying again
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
curl: option --retry-all-errors: is unknown
curl: try 'curl --help' or 'curl --manual' for more information
    found:    e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
    expected: dd140223ec842ebe4c69ec6aa2966b97dacdd9ce112490e310f374134188d0c4
Traceback (most recent call last):
  File "/checkout/src/bootstrap/bootstrap.py", line 965, in <module>
  File "/checkout/src/bootstrap/bootstrap.py", line 965, in <module>
    main()
  File "/checkout/src/bootstrap/bootstrap.py", line 950, in main
    bootstrap(args)
  File "/checkout/src/bootstrap/bootstrap.py", line 914, in bootstrap
    build.download_toolchain()
  File "/checkout/src/bootstrap/bootstrap.py", line 436, in download_toolchain
    self._download_component_helper(filename, pattern, tarball_suffix)
  File "/checkout/src/bootstrap/bootstrap.py", line 468, in _download_component_helper
  File "/checkout/src/bootstrap/bootstrap.py", line 51, in get
    raise RuntimeError("failed verification")
RuntimeError: failed verification
make: *** [Makefile:58: prepare] Error 1
make: *** [Makefile:58: prepare] Error 1
Command failed. Attempt 5/5:
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
curl: option --retry-all-errors: is unknown
curl: try 'curl --help' or 'curl --manual' for more information
spurious failure, trying again
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
curl: option --retry-all-errors: is unknown
curl: try 'curl --help' or 'curl --manual' for more information
spurious failure, trying again
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
curl: option --retry-all-errors: is unknown
curl: try 'curl --help' or 'curl --manual' for more information
spurious failure, trying again
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
curl: option --retry-all-errors: is unknown
curl: try 'curl --help' or 'curl --manual' for more information
spurious failure, trying again
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
downloading https://static.rust-lang.org/dist/2023-03-07/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
curl: option --retry-all-errors: is unknown
curl: try 'curl --help' or 'curl --manual' for more information
    found:    e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
    expected: dd140223ec842ebe4c69ec6aa2966b97dacdd9ce112490e310f374134188d0c4
Traceback (most recent call last):
  File "/checkout/src/bootstrap/bootstrap.py", line 965, in <module>
  File "/checkout/src/bootstrap/bootstrap.py", line 965, in <module>
    main()
  File "/checkout/src/bootstrap/bootstrap.py", line 950, in main
    bootstrap(args)
  File "/checkout/src/bootstrap/bootstrap.py", line 914, in bootstrap
    build.download_toolchain()
  File "/checkout/src/bootstrap/bootstrap.py", line 436, in download_toolchain
    self._download_component_helper(filename, pattern, tarball_suffix)
  File "/checkout/src/bootstrap/bootstrap.py", line 468, in _download_component_helper
  File "/checkout/src/bootstrap/bootstrap.py", line 51, in get
    raise RuntimeError("failed verification")
RuntimeError: failed verification
make: *** [Makefile:58: prepare] Error 1

@matthiaskrgr matthiaskrgr deleted the rollup-rc0zpf2 branch March 16, 2024 18:19
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
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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
No milestone
Development

Successfully merging this pull request may close these issues.

None yet