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 4 pull requests #124564

Merged
merged 8 commits into from
Apr 30, 2024
Merged

Rollup of 4 pull requests #124564

merged 8 commits into from
Apr 30, 2024

Commits on Apr 30, 2024

  1. write git-commit-{sha,info} for Cargo in source tarballs 

    This will allow Cargo's build script to pick it up, and populate the
correct git information in its version output.
    @pietroalbini
    pietroalbini committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    7a5038f View commit details
    Browse the repository at this point in the history

  2. Add test for efficient codegen of manual eq implementations of a sm… 

    …all struct
    @clubby789
    clubby789 committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    7032c92 View commit details
    Browse the repository at this point in the history

  3. Add normalize() in run-make Diff type

    @GuillaumeGomez
    GuillaumeGomez committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    e0ec71f View commit details
    Browse the repository at this point in the history

  4. Port repr128-dwarf run-make test to rmake

    @beetrees
    beetrees committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    c2fd6ed View commit details
    Browse the repository at this point in the history

  5. Rollup merge of rust-lang#124280 - beetrees:repr128-test-rmake, r=jie… 

    …youxu

Port repr128-dwarf run-make test to rmake

This PR ports the repr128-dwarf run-make test to rmake, using the `gimli` crate instead of the `llvm-dwarfdump` command.

Note that this PR changes `rmake.rs` files to be compiled with the 2021 edition (previously no edition was passed to `rustc`, meaning they were compiled with the 2015 edition). This means that `panic!("{variable}")` will now work as expected in `rmake.rs` files (there's already a usage in the [wasm-symbols-not-exported test](https://github.com/rust-lang/rust/blob/aca749eefceaed0cda19a7ec5e472fce9387bc00/tests/run-make/wasm-symbols-not-exported/rmake.rs#L34) that this will fix).

Tracking issue: rust-lang#121876
    @jieyouxu
    jieyouxu authored Apr 30, 2024
    Configuration menu
    Copy the full SHA
    ce18639 View commit details
    Browse the repository at this point in the history

  6. Rollup merge of rust-lang#124299 - clubby789:106269-test, r=nikic 

    Add test for issue 106269

Closes rust-lang#106269

Made this an assembly test as the LLVM codegen is still quite verbose and doesn't really indicate the behaviour we want
    @jieyouxu
    jieyouxu authored Apr 30, 2024
    Configuration menu
    Copy the full SHA
    4b6c191 View commit details
    Browse the repository at this point in the history

  7. Rollup merge of rust-lang#124553 - ferrocene:pa-cargo-git-info, r=onu… 

    …r-ozkan

Write `git-commit-{sha,info}` for Cargo in source tarballs

Right now Cargo doesn't populate the commit hash or date in its version output when it's built from the plain source tarball. That's because we don't include the git information for it, and Cargo's build script doesn't pick it up.

This PR *partially* solves the problem by storing the git information for Cargo in `src/tools/cargo` in the plain source tarball. We store separate information because even when built in CI Cargo uses its own git information rather than Rust's.

This PR will also require a change in the Cargo repository to consume this information (rust-lang/cargo#13832), but it doesn't have to be blocked on the Cargo PR being merged.
    @jieyouxu
    jieyouxu authored Apr 30, 2024
    Configuration menu
    Copy the full SHA
    9ef81e0 View commit details
    Browse the repository at this point in the history

  8. Rollup merge of rust-lang#124561 - GuillaumeGomez:run-make-normalize,… 

    … r=jieyouxu

Add `normalize()` in run-make `Diff` type

I need it to do the same as:

```
//@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
```

in doctests.

I need it in particular for the rust-lang#123974 PR (which contains this commit until this PR current PR is merged).

cc `@Urgau`
r? `@jieyouxu`
    @jieyouxu
    jieyouxu authored Apr 30, 2024
    Configuration menu
    Copy the full SHA
    7350a7f View commit details
    Browse the repository at this point in the history