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 5 pull requests #114367

Closed
wants to merge 11 commits into from
Closed

Conversation

Noratrieb
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Enselic and others added 11 commits July 29, 2023 08:51
I could not find a test for this particular use case. The closest I got
was `tests/ui/imports/issue-37887.rs`, but that is a regression test
for a different use case.
…oli-obk

Use `upvar_tys` in more places, make it return a list

Just a cleanup that fell out of a PR that I was gonna write, but that PR kinda got stuck.
Add regression test for resolving `--extern libc=test.rlib`

Closes rust-lang#26043

I could not find a test for this particular use case. The closest I got was [`tests/ui/imports/issue-37887.rs`](https://github.com/rust-lang/rust/blob/master/tests/ui/imports/issue-37887.rs), but that is a regression test for a different use case (see rust-lang#37887).
fix and extend ptr_comparison test

r? ``@oli-obk``
…ount, r=albertlarsan68

x.py print more detailed format files and untracked files count

Fixes rust-lang#114245
Update cargo

8 commits in c91a693e7977e33a1064b63a5daf5fb689f01651..6dc1deaddf62c7748c9097c7ea88e9ec77ff1a1a
2023-07-31 00:26:46 +0000 to 2023-08-02 00:23:54 +0000
- `#[allow(internal_features)]` in RUSTC_BOOTSTRAP test (rust-lang/cargo#12429)
- ci: rewrite bump check and respect semver (rust-lang/cargo#12395)
- fix(update): Tweak CLI behavior (rust-lang/cargo#12428)
- chore(deps): update compatible (rust-lang/cargo#12426)
- Display crate version on timings graph (rust-lang/cargo#12420)
- chore(deps): update alpine docker tag to v3.18 (rust-lang/cargo#12427)
- Use thiserror for credential provider errors (rust-lang/cargo#12424)
- Clarify in `--help` that `cargo test --all-targets` excludes doctests (rust-lang/cargo#12422)

r? ``@ghost``
@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. rollup A PR which is a rollup labels Aug 2, 2023
@Noratrieb
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Aug 2, 2023

📌 Commit a771548 has been approved by Nilstrieb

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 Aug 2, 2023
@bors
Copy link
Contributor

bors commented Aug 2, 2023

⌛ Testing commit a771548 with merge 9500238050182795d827332604345ec73cd9c4c7...

@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
Dist rust-src-nightly
 finished in 5.606 seconds
[TIMING] dist::Src Src -- 5.684
##[group]Building tool cargo (stage1:x86_64-unknown-linux-gnu -> stage2:loongarch64-unknown-linux-gnu)
warning: /checkout/src/tools/cargo/Cargo.toml: version requirement `0.15.2+1.6.4` for dependency `libgit2-sys` includes semver metadata which will be ignored, removing the metadata is recommended to avoid confusion
---
   Compiling tinyvec v1.6.0
error[E0425]: cannot find value `SYS_open` in this scope
   --> /cargo/registry/src/index.crates.io-6f17d22bba15001f/rustix-0.38.4/src/backend/libc/fs/syscalls.rs:124:19
    |
124 |             ) via SYS_open -> c::c_int
    |                   ^^^^^^^^ help: a constant with a similar name exists: `SYS_fsopen`
   ::: /cargo/registry/src/index.crates.io-6f17d22bba15001f/libc-0.2.147/src/unix/linux_like/linux/gnu/b64/loongarch64/mod.rs:548:1
    |
    |
548 | pub const SYS_fsopen: ::c_long = 430;
    | ------------------------------ similarly named constant `SYS_fsopen` defined here
[RUSTC-TIMING] build_script_build test:false 0.176
   Compiling signal-hook-registry v1.4.1
[RUSTC-TIMING] nom test:false 3.788
For more information about this error, try `rustc --explain E0425`.

@bors
Copy link
Contributor

bors commented Aug 2, 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 Aug 2, 2023
@Noratrieb Noratrieb mentioned this pull request Aug 2, 2023
@Noratrieb Noratrieb closed this Aug 2, 2023
@Noratrieb Noratrieb deleted the rollup-mhx43pz branch August 2, 2023 11:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants