diff options
| author | bors <bors@rust-lang.org> | 2023-12-04 12:26:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-12-04 12:26:55 +0000 |
| commit | 0a83e43f282353398e4b22466cf1f4e3cc8c1682 (patch) | |
| tree | a4c5c469aaf7a085228da2f12784feea53c176ab /compiler/rustc_codegen_llvm/src/attributes.rs | |
| parent | cf8d81213c193fc0ca9f2b99165476f8ae028295 (diff) | |
| parent | 5808b72484204af035a4d9683731f44bd8d59529 (diff) | |
| download | rust-0a83e43f282353398e4b22466cf1f4e3cc8c1682.tar.gz rust-0a83e43f282353398e4b22466cf1f4e3cc8c1682.zip | |
Auto merge of #118597 - lnicola:cargotest-no-branch, r=Mark-Simulacrum
Don't ask for a specific branch in cargotest
Tentative fix for https://github.com/rust-lang/rust/pull/118592#issuecomment-1838180918.
`servo` [just renamed](https://github.com/servo/servo/pull/30788) their `master` branch to `main`, but `cargotest` does a `git fetch $URL master; git reset --hard $SHA`. Let's try to change that to `git fetch $URL $SHA; git reset --hard $SHA`, which appears to work, but I can't confirm for sure because I'm having some trouble with `x.py`:
```
--> library/rustc-std-workspace-core/lib.rs:4:9
|
4 | pub use core::*;
| ^^^^
|
= note: the following crate versions were found:
crate `core` compiled by rustc 1.76.0-nightly (85a4bd8f5 2023-12-04): ./build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-linux-gnu/release/deps/libcore-70719e8645e6f000.rmeta
= help: please recompile that crate using this compiler (rustc 1.76.0-nightly (5808b7248 2023-12-04)) (consider running `cargo clean` first)
```
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/attributes.rs')
0 files changed, 0 insertions, 0 deletions