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.

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

MaybeUninit: some docs, rename into_inner -> into_initialized, return &mut from set #58129

Merged
merged 10 commits into from
Feb 10, 2019

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Feb 3, 2019

No description provided.

@rust-highfive
Copy link
Collaborator

r? @cramertj

(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 Feb 3, 2019
@RalfJung RalfJung changed the title MaybeUninit: some docs, rename into_inner -> into_initialized MaybeUninit: some docs, rename into_inner -> into_initialized, return &mut from set Feb 3, 2019
src/libcore/mem.rs Outdated Show resolved Hide resolved
src/libcore/mem.rs Outdated Show resolved Hide resolved
@rust-highfive

This comment has been minimized.

@rust-highfive

This comment has been minimized.

@cramertj
Copy link
Member

cramertj commented Feb 5, 2019

r=me w/ travis

@rust-highfive

This comment has been minimized.

@rust-highfive

This comment has been minimized.

@rust-highfive

This comment has been minimized.

@RalfJung
Copy link
Member Author

RalfJung commented Feb 6, 2019

@bors r=cramertj

@bors
Copy link
Contributor

bors commented Feb 6, 2019

📌 Commit f3eede6 has been approved by cramertj

@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 Feb 6, 2019
pietroalbini added a commit to pietroalbini/rust that referenced this pull request Feb 10, 2019
MaybeUninit: some docs, rename into_inner -> into_initialized, return &mut from set
@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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-author Status: This is awaiting some action (such as code changes or more information) from the author. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 10, 2019
@RalfJung
Copy link
Member Author

@bors r=cramertj

@bors
Copy link
Contributor

bors commented Feb 10, 2019

📌 Commit 4853ce6 has been approved by cramertj

@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 Feb 10, 2019
@bors
Copy link
Contributor

bors commented Feb 10, 2019

⌛ Testing commit 4853ce6 with merge 2eaec1089a5637147d4f1221ee2cf7eac9e8cb74...

@bors
Copy link
Contributor

bors commented Feb 10, 2019

💔 Test failed - checks-travis

@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 Feb 10, 2019
@rust-highfive
Copy link
Collaborator

The job dist-various-2 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
[01:01:31]    Compiling panic_unwind v0.0.0 (/checkout/src/libpanic_unwind)
[01:01:32] [RUSTC-TIMING] panic_unwind test:false 0.290
[01:01:32] warning: dropping unsupported crate type `dylib` for target `x86_64-fortanix-unknown-sgx`
[01:01:32] 
[01:01:35] error[E0624]: method `into_inner` is private
[01:01:35]   --> src/libstd/sys/sgx/ext/arch.rs:44:25
[01:01:35]    |
[01:01:35] 44 |             0 => Ok(out.into_inner()),
[01:01:35] 
[01:01:35] error[E0624]: method `into_inner` is private
[01:01:35] error[E0624]: method `into_inner` is private
[01:01:35]   --> src/libstd/sys/sgx/ext/arch.rs:72:16
[01:01:35] 72 |         report.into_inner()
[01:01:35]    |                ^^^^^^^^^^
[01:01:35] 
[01:01:37] error: aborting due to 2 previous errors
---
travis_time:end:0ddf7486:start=1549821839519904601,finish=1549821839535653988,duration=15749387
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:1aaf1660
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:33a39318
travis_time:start:33a39318
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:0722a705
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@RalfJung
Copy link
Member Author

I think this should fix the SGX failures, but I don't know how to test that locally...

@bors r=cramertj

@bors
Copy link
Contributor

bors commented Feb 10, 2019

📌 Commit 4833074 has been approved by cramertj

@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 Feb 10, 2019
@bors
Copy link
Contributor

bors commented Feb 10, 2019

⌛ Testing commit 4833074 with merge 0b7af26...

bors added a commit that referenced this pull request Feb 10, 2019
MaybeUninit: some docs, rename into_inner -> into_initialized, return &mut from set
@bors
Copy link
Contributor

bors commented Feb 10, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: cramertj
Pushing 0b7af26 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 10, 2019
@bors bors merged commit 4833074 into rust-lang:master Feb 10, 2019
chrysn added a commit to RIOT-OS/rust-riot-sys that referenced this pull request May 31, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.

5 participants