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

compiletest: ignore-endian-big, fixes #74829, fixes #74885 #74888

Merged
merged 1 commit into from
Aug 7, 2020
Merged

compiletest: ignore-endian-big, fixes #74829, fixes #74885 #74888

merged 1 commit into from
Aug 7, 2020

Conversation

infinity0
Copy link
Contributor

See discussion on #74829

I tested it on a Debian s390x machine, works well.

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(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 28, 2020
@infinity0 infinity0 force-pushed the ignore-endian-big branch 2 times, most recently from 3b5c0f0 to 4ab23a4 Compare July 28, 2020 20:47
@nikomatsakis
Copy link
Contributor

makes sense.

@bors r+

@bors
Copy link
Contributor

bors commented Jul 29, 2020

📌 Commit 4ab23a4217a11446dc9e357f862d59b24fbecb0f has been approved by nikomatsakis

@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 Jul 29, 2020
@bors
Copy link
Contributor

bors commented Jul 29, 2020

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

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 29, 2020
@infinity0
Copy link
Contributor Author

@bors rollup

@bors
Copy link
Contributor

bors commented Jul 30, 2020

@infinity0: 🔑 Insufficient privileges: not in try users

@infinity0
Copy link
Contributor Author

ping @nikomatsakis :) i suppose the bot can't automatically figure out that i did the merge "correctly"

@nikomatsakis
Copy link
Contributor

@infinity0 can you actually rebase instead? we prefer to avoid merge commits. Thanks! ❤️

@infinity0 infinity0 force-pushed the ignore-endian-big branch from 5fb5833 to 7f54cf2 Compare July 31, 2020 11:59
@infinity0
Copy link
Contributor Author

@nikomatsakis sure, done

@infinity0
Copy link
Contributor Author

ping @nikomatsakis :)

@nikomatsakis
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 5, 2020

📌 Commit 7f54cf2 has been approved by nikomatsakis

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 5, 2020
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Aug 6, 2020
@JohnTitor
Rollup merge of rust-lang#74888 - infinity0:ignore-endian-big, r=niko…
cd742a5 
…matsakis

compiletest: ignore-endian-big, fixes rust-lang#74829, fixes rust-lang#74885

See discussion on rust-lang#74829

I tested it on a Debian s390x machine, works well.
@JohnTitor JohnTitor mentioned this pull request Aug 6, 2020
Closed
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Aug 6, 2020
@JohnTitor
Rollup merge of rust-lang#74888 - infinity0:ignore-endian-big, r=niko…
3c3067c 
…matsakis

compiletest: ignore-endian-big, fixes rust-lang#74829, fixes rust-lang#74885

See discussion on rust-lang#74829

I tested it on a Debian s390x machine, works well.
@JohnTitor JohnTitor mentioned this pull request Aug 6, 2020
Closed
@bors
Copy link
Contributor

bors commented Aug 6, 2020

⌛ Testing commit 7f54cf2 with merge 7b449837a1fd8337ac326a5acc5179f80eefb99d...

@JohnTitor
Copy link
Member

@bors retry rolled up

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Aug 6, 2020

⌛ Testing commit 7f54cf2 with merge b44f22b0824d6fd608307b1efd7e03ddc4eaf0e4...

@bors
Copy link
Contributor

bors commented Aug 6, 2020

💔 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 Aug 6, 2020
@infinity0
Copy link
Contributor Author

If I'm reading the failure right, it seems like a transient issue? error: io error when listing tests: Os { code: 107, kind: NotConnected, message: "Socket not connected" }

@tmiasko tmiasko mentioned this pull request Aug 6, 2020
Merged
@JohnTitor
Copy link
Member

The failure is spurious and should be fixed by #75228.
@bors retry

@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 6, 2020
@JohnTitor JohnTitor mentioned this pull request Aug 7, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 7, 2020
@bors
Auto merge of rust-lang#75238 - JohnTitor:rollup-llbk0sq, r=JohnTitor
6396dbb 
Rollup of 12 pull requests

Successful merges:

 - rust-lang#74888 (compiletest: ignore-endian-big, fixes rust-lang#74829, fixes rust-lang#74885)
 - rust-lang#75175 (Make doctests of Ipv4Addr::from(u32) easier to read)
 - rust-lang#75179 (Remove unused FromInner impl for Ipv4Addr)
 - rust-lang#75181 (Fix typo in  `librustc_feature/active.rs`)
 - rust-lang#75183 (Label rustfmt toolstate issues with A-rustfmt)
 - rust-lang#75188 (Handle fieldless tuple structs in diagnostic code)
 - rust-lang#75190 (Clean up E0746 explanation)
 - rust-lang#75210 (Change the type of `AssertModuleSource::available_cgus`.)
 - rust-lang#75211 (Note about endianness of returned value of {integer}::from_be_bytes and friends)
 - rust-lang#75217 (Clean up E0747 explanation)
 - rust-lang#75232 (Fix typo "TraitObligatiom" -> "TraitObligation")
 - rust-lang#75236 (Fix typo "biset" -> "bitset")

Failed merges:

r? @ghost
@bors bors merged commit 9d5bd59 into rust-lang:master Aug 7, 2020
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nikomatsakis nikomatsakis

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.47.0
Development

Successfully merging this pull request may close these issues.
7 participants
@infinity0 @rust-highfive @nikomatsakis @bors @JohnTitor @rust-log-analyzer @cuviper