Skip to content

Fix stdarch submodule pointing to commit outside tree - #93035

Merged
bors merged 1 commit into
rust-lang:masterfrom
Amanieu:stdarch_fix
Jan 19, 2022
Merged

Fix stdarch submodule pointing to commit outside tree#93035
bors merged 1 commit into
rust-lang:masterfrom
Amanieu:stdarch_fix

Conversation

@Amanieu

Copy link
Copy Markdown
Member

PR #93016 was merged with the stdarch submodule pointing to a commit in
a PR branch and not in master. This was due to a circular dependency
between the rust and stdarch changes which would cause the other to fail
to build.

cc #75109

PR rust-lang#93016 was merged with the stdarch submodule pointing to a commit in
a PR branch and not in master. This was due to a circular dependency
between the rust and stdarch changes which would cause the other to fail
to build.
cc rust-lang#75109
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @yaahc

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive

Copy link
Copy Markdown
Contributor

⚠️Warning⚠️

  • These commits modify submodules.

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 18, 2022
@AmanieuAmanieu mentioned this pull request Jan 18, 2022
@Mark-Simulacrum

Copy link
Copy Markdown
Member

@bors r+ rollup

@bors

bors commented Jan 18, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 3db479e has been approved by Mark-Simulacrum

@borsbors 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 Jan 18, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 18, 2022
…askrgr
Rollup of 9 pull requests
Successful merges:
- rust-lang#90782 (Implement raw-dylib support for windows-gnu)
- rust-lang#91150 (Let qpath contain NtTy: `<$:ty as $:ty>::…`)
- rust-lang#92425 (Improve SIMD casts)
- rust-lang#92692 (Simplify and unify rustdoc sidebar styles)
- rust-lang#92780 (Directly use ConstValue for single literals in blocks)
- rust-lang#92924 (Delete pretty printer tracing)
- rust-lang#93018 (Remove some unused `Ord` derives based on `Span`)
- rust-lang#93026 (fix typo in `max` description for f32/f64)
- rust-lang#93035 (Fix stdarch submodule pointing to commit outside tree)
Failed merges:
- rust-lang#92861 (Rustdoc mobile: put out-of-band info on its own line)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit f851a84 into rust-lang:masterJan 19, 2022
@rustbotrustbot added this to the 1.60.0 milestone Jan 19, 2022
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@Amanieu@rust-highfive@Mark-Simulacrum@bors@yaahc@rustbot