Skip to content

Conversation

androm3da
Copy link
Contributor

No description provided.

@rust-highfive
Copy link
Contributor

r? @withoutboats

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 25, 2020
@androm3da androm3da force-pushed the fix_libstd_hexlinux_01 branch from 68f7d2f to 5a5c051 Compare July 25, 2020 04:41
@androm3da
Copy link
Contributor Author

Whoops: I normally use editors with rustfmt-on-save but I was just using a host where that's not setup yet.

@bors
Copy link
Collaborator

bors commented Jul 28, 2020

☔ The latest upstream changes (presumably #73265) made this pull request unmergeable. Please resolve the merge conflicts.

@androm3da androm3da force-pushed the fix_libstd_hexlinux_01 branch from 5a5c051 to 2ca1e59 Compare July 28, 2020 04:39
@androm3da
Copy link
Contributor Author

Ping?

@androm3da
Copy link
Contributor Author

@withoutboats could you take a look or delegate if you get a chance?

@Dylan-DPC-zz
Copy link

r? @dtolnay

Copy link
Member

@dtolnay dtolnay left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Stamping without particular scrutiny on the basis that:

  • Change only affects cfg(target_arch = "hexagon")
  • All this was originally added by you in #62814.
  • Hexagon is a Tier 3 platform so whatever happens happens.

@dtolnay
Copy link
Member

dtolnay commented Aug 25, 2020

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Aug 25, 2020

📌 Commit 2ca1e59 has been approved by dtolnay

@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 25, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 27, 2020
Rollup of 10 pull requests

Successful merges:

 - rust-lang#74730 (Hexagon libstd: update type defs)
 - rust-lang#75758 (Fixes for VxWorks)
 - rust-lang#75780 (Unconfuse Unpin docs a bit)
 - rust-lang#75806 (Prevent automatic page change when using history)
 - rust-lang#75818 (Update docs for SystemTime Windows implementation)
 - rust-lang#75837 (Fix font color for help button in ayu and dark themes)
 - rust-lang#75870 (Unify theme choices border color in ayu theme)
 - rust-lang#75875 (Shorten liballoc vec resize intra-doc link)
 - rust-lang#75953 (Fix swapped stability attributes for rustdoc lints)
 - rust-lang#75958 (Avoid function-scoping global variables)

Failed merges:

r? @ghost
@bors bors merged commit 2eec2ec into rust-lang:master Aug 27, 2020
@cuviper cuviper added this to the 1.48.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: 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.

7 participants