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 #125131

Closed
wants to merge 12 commits into from
Closed

Conversation

jieyouxu
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

OliverKillane and others added 12 commits May 5, 2024 13:54
In case the source is not in the same filesystem.
…types-improvement, r=pnkfelix

`rustc --explain E0582` additional example

## Context
*From rust-lang#124744*

Expands the example for E0582, an error ensuring that lifetime in a function's return type is sufficiently constrained (e.g. actually tied to some input type), to show an additional example where one sees the lifetime occurring syntactically among the relevant function input types, but is nonetheless rejected by rustc because a syntactic occurrence is not always sufficient.
Use an helper to move the files

In case the source is not in the same filesystem.

See openwrt/packages@c1b3e04#commitcomment-141886468
…eyouxu

Migrate `run-make/c-link-to-rust-staticlib` to `rmake`

Part of rust-lang#121876.

r? `@jieyouxu`

try-job: dist-x86_64-freebsd
…ieril

`rustc_hir_typeck`: Account for `skipped_ref_pats` in `expr_use_visitor`

Fixes rust-lang#125058

r? `@Nadrieril`

cc rust-lang#123076

`@rustbot` label A-edition-2024 A-patterns
Migrate `run-make/no-cdylib-as-rdylib` to `rmake`

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

> "the test will fail if the cdylib is picked, because it doesn't export any rust symbols"

Is that true? Is there a way to verify?

I suggest maybe extending the test with: (after cleaning the directory)

```rust
    rustc()
        .input("bar.rs")
        .crate_type("cdylib")
        .run();
    rustc()
        .input("foo.rs")
        .prefer_dynamic()
        .run();
    fail();
```

to make sure we're actually testing something here.
@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-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 May 14, 2024
@jieyouxu
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented May 14, 2024

📌 Commit 49d9c1e has been approved by jieyouxu

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 May 14, 2024
@bors
Copy link
Contributor

bors commented May 14, 2024

⌛ Testing commit 49d9c1e with merge 7cd7f2d...

bors added a commit to rust-lang-ci/rust that referenced this pull request May 14, 2024
Rollup of 5 pull requests

Successful merges:

 - rust-lang#124746 (`rustc --explain E0582` additional example)
 - rust-lang#124975 (Use an helper to move the files)
 - rust-lang#125027 (Migrate `run-make/c-link-to-rust-staticlib` to `rmake`)
 - rust-lang#125084 (`rustc_hir_typeck`: Account for `skipped_ref_pats` in `expr_use_visitor`)
 - rust-lang#125104 (Migrate `run-make/no-cdylib-as-rdylib` to `rmake`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Contributor

bors commented May 14, 2024

💔 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 May 14, 2024
@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
[TIMING] core::build_steps::tool::ToolBuild { compiler: Compiler { stage: 0, host: aarch64-apple-darwin }, target: aarch64-apple-darwin, tool: "tidy", path: "src/tools/tidy", mode: ToolBootstrap, source_type: InTree, extra_features: [], allow_features: "" } -- 18.799
[TIMING] core::build_steps::tool::Tidy { compiler: Compiler { stage: 0, host: aarch64-apple-darwin }, target: aarch64-apple-darwin } -- 0.000
fmt check
skip untracked path AWSCLIV2.pkg during rustfmt invocations
##[error]Diff in /Users/runner/work/rust/rust/tests/run-make/c-link-to-rust-staticlib/rmake.rs at line 8:
 fn main() {
 fn main() {
     rustc().input("foo.rs").run();
-    cc().input("bar.c")
-        .input(static_lib("foo"))
-        .out_exe("bar")
-        .args(&extra_c_flags())
-        .run();
+    cc().input("bar.c").input(static_lib("foo")).out_exe("bar").args(&extra_c_flags()).run();
     run("bar");
     fs::remove_file(static_lib("foo"));
     run("bar");
Running `"/Users/runner/work/rust/rust/build/aarch64-apple-darwin/rustfmt/bin/rustfmt" "--config-path" "/Users/runner/work/rust/rust" "--edition" "2021" "--unstable-features" "--skip-children" "--check" "/Users/runner/work/rust/rust/tests/run-make/rustdoc-output-path/rmake.rs" "/Users/runner/work/rust/rust/tests/run-make/wasm-symbols-not-exported/rmake.rs" "/Users/runner/work/rust/rust/tests/run-make/rust-lld-custom-target/rmake.rs" "/Users/runner/work/rust/rust/tests/run-make/wasm-custom-sections-opt/rmake.rs" "/Users/runner/work/rust/rust/tests/run-make/wasm-symbols-not-imported/rmake.rs" "/Users/runner/work/rust/rust/tests/run-make/exit-code/rmake.rs" "/Users/runner/work/rust/rust/tests/run-make/c-link-to-rust-staticlib/rmake.rs" "/Users/runner/work/rust/rust/tests/run-make/wasm-import-module/rmake.rs" "/Users/runner/work/rust/rust/tests/run-make/wasm-abi/rmake.rs" "/Users/runner/work/rust/rust/tests/run-make/rust-lld/rmake.rs" "/Users/runner/work/rust/rust/tests/run-make/rustdoc-error-lines/rmake.rs"` failed.
If you're running `tidy`, try again with `--bless`. Or, if you just want to format code, run `./x.py fmt` instead.
  local time: Tue May 14 23:02:40 UTC 2024
  network time: Tue, 14 May 2024 23:02:40 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

@compiler-errors
Copy link
Member

#125027 (comment)

@jieyouxu jieyouxu deleted the rollup-oqprchr branch May 15, 2024 05:24
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 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