Skip to content

adjust MaybeUninit API to discussions #59284

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 2 commits into from
Mar 28, 2019
Merged

Conversation

RalfJung
Copy link
Member

uninitialized -> uninit
into_initialized -> assume_init
read_initialized -> read
set -> write

@rust-highfive
Copy link
Contributor

r? @sfackler

(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 Mar 18, 2019
@jethrogb
Copy link
Contributor

Missed some in

  • src/libstd/sys/sgx/rwlock.rs
  • src/libstd/sys/sgx/ext/arch.rs

@RalfJung
Copy link
Member Author

Thanks for pointing that out!

The one in rwlock.rs actually already did not compile, it still used into_inner...

/// Deprecated before stabilization.
#[unstable(feature = "maybe_uninit", issue = "53491")]
#[inline(always)]
// FIXME: still used by stdsimd
Copy link
Member

Choose a reason for hiding this comment

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

We should be able to future-deprecate it even though stdsimd uses it, right?

Copy link
Member Author

@RalfJung RalfJung Mar 20, 2019

Choose a reason for hiding this comment

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

We have warn(deprecated_in_future) and also on CI compile with -D warnings. So I'm afraid I don't think we can.

@sfackler
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 25, 2019

📌 Commit 9374efa has been approved by sfackler

@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 Mar 25, 2019
Centril added a commit to Centril/rust that referenced this pull request Mar 26, 2019
adjust MaybeUninit API to discussions

uninitialized -> uninit
into_initialized -> assume_init
read_initialized -> read
set -> write
@Centril
Copy link
Contributor

Centril commented Mar 26, 2019

@bors r- due to merge conflict.

@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 Mar 26, 2019
@bors
Copy link
Collaborator

bors commented Mar 26, 2019

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

uninitialized -> uninit
into_initialized -> assume_init
read_initialized -> read
set -> write
@RalfJung
Copy link
Member Author

Rebased.

@bors r=sfackler

@bors
Copy link
Collaborator

bors commented Mar 26, 2019

📌 Commit 853ae8d has been approved by sfackler

@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 Mar 26, 2019
Centril added a commit to Centril/rust that referenced this pull request Mar 27, 2019
adjust MaybeUninit API to discussions

uninitialized -> uninit
into_initialized -> assume_init
read_initialized -> read
set -> write
Centril added a commit to Centril/rust that referenced this pull request Mar 27, 2019
adjust MaybeUninit API to discussions

uninitialized -> uninit
into_initialized -> assume_init
read_initialized -> read
set -> write
Centril added a commit to Centril/rust that referenced this pull request Mar 27, 2019
adjust MaybeUninit API to discussions

uninitialized -> uninit
into_initialized -> assume_init
read_initialized -> read
set -> write
cuviper added a commit to cuviper/rust that referenced this pull request Mar 28, 2019
adjust MaybeUninit API to discussions

uninitialized -> uninit
into_initialized -> assume_init
read_initialized -> read
set -> write
bors added a commit that referenced this pull request Mar 28, 2019
Rollup of 18 pull requests

Successful merges:

 - #57293 (Make some lints incremental)
 - #57565 (syntax: Remove warning for unnecessary path disambiguators)
 - #58253 (librustc_driver => 2018)
 - #58837 (librustc_interface => 2018)
 - #59268 (Add suggestion to use `&*var` when `&str: From<String>` is expected)
 - #59283 (Make ASCII case conversions more than 4× faster)
 - #59284 (adjust MaybeUninit API to discussions)
 - #59372 (add rustfix-able suggestions to trim_{left,right} deprecations)
 - #59390 (Make `ptr::eq` documentation mention fat-pointer behavior)
 - #59393 (Refactor tuple comparison tests)
 - #59420 ([CI] record docker image info for reuse)
 - #59421 (Reject integer suffix when tuple indexing)
 - #59430 (Renames `EvalContext` to `InterpretCx`)
 - #59439 (Generalize diagnostic for `x = y` where `bool` is the expected type)
 - #59449 (fix: Make incremental artifact deletion more robust)
 - #59451 (Add `Default` to `std::alloc::System`)
 - #59459 (Add some tests)
 - #59460 (Include id in Thread's Debug implementation)

Failed merges:

r? @ghost
@bors bors merged commit 853ae8d into rust-lang:master Mar 28, 2019
@jethrogb
Copy link
Contributor

Testing std stage1 (x86_64-unknown-linux-gnu -> x86_64-fortanix-unknown-sgx)
   Compiling std v0.0.0 (/home/jenkins/workspace/rust-sgx-ci/rust/src/libstd)
error: use of deprecated item 'core::mem::MaybeUninit::<T>::set': use `write` instead
   --> src/libstd/sys/sgx/rwlock.rs:271:18
    |
271 |             init.set(RWLock::new());
    |                  ^^^
    |
= note: `-D deprecated` implied by `-D warnings`

jethrogb pushed a commit to jethrogb/rust that referenced this pull request Mar 29, 2019
Centril added a commit to Centril/rust that referenced this pull request Mar 29, 2019
bors added a commit that referenced this pull request Mar 29, 2019
Rollup of 11 pull requests

Successful merges:

 - #58019 (Combine all builtin late lints and make lint checking parallel)
 - #59358 (Use `track_errors` instead of hand rolling)
 - #59394 (warn -> deny duplicate match bindings)
 - #59401 (bootstrap: build crates under libtest with -Z emit-stack-sizes)
 - #59423 (Visit path in `walk_mac`)
 - #59468 (musl: build toolchain libs with -fPIC)
 - #59476 (Use `SmallVec` in `TokenStreamBuilder`.)
 - #59496 (Remove unnecessary with_globals calls)
 - #59498 (Use 'write_all' instead of 'write' in example code)
 - #59503 (Stablize {f32,f64}::copysign().)
 - #59511 (Fix missed fn rename in #59284)

Failed merges:

r? @ghost
bors added a commit that referenced this pull request Mar 29, 2019
Rollup of 11 pull requests

Successful merges:

 - #58019 (Combine all builtin late lints and make lint checking parallel)
 - #59358 (Use `track_errors` instead of hand rolling)
 - #59394 (warn -> deny duplicate match bindings)
 - #59401 (bootstrap: build crates under libtest with -Z emit-stack-sizes)
 - #59423 (Visit path in `walk_mac`)
 - #59468 (musl: build toolchain libs with -fPIC)
 - #59476 (Use `SmallVec` in `TokenStreamBuilder`.)
 - #59496 (Remove unnecessary with_globals calls)
 - #59498 (Use 'write_all' instead of 'write' in example code)
 - #59503 (Stablize {f32,f64}::copysign().)
 - #59511 (Fix missed fn rename in #59284)

Failed merges:

r? @ghost
@RalfJung RalfJung deleted the maybe-uninit branch March 29, 2019 08:57
@RalfJung
Copy link
Member Author

Sorry, seems like I missed one use. :/

chrysn added a commit to RIOT-OS/rust-riot-sys that referenced this pull request May 31, 2022
# for free to join this conversation on GitHub. Already have an account? # 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.

6 participants