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

adjust MaybeUninit API to discussions #59284

Merged
merged 2 commits into from Mar 28, 2019

Conversation

Projects
None yet
6 participants
@RalfJung
Copy link
Member

RalfJung commented Mar 18, 2019

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

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Mar 18, 2019

r? @sfackler

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

@jethrogb

This comment has been minimized.

Copy link
Contributor

jethrogb commented Mar 18, 2019

Missed some in

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

This comment has been minimized.

Copy link
Member Author

RalfJung commented Mar 19, 2019

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

This comment has been minimized.

Copy link
@sfackler

sfackler Mar 20, 2019

Member

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

This comment has been minimized.

Copy link
@RalfJung

RalfJung Mar 20, 2019

Author Member

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

This comment has been minimized.

Copy link
Member

sfackler commented Mar 25, 2019

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Mar 25, 2019

📌 Commit 9374efa has been approved by sfackler

Centril added a commit to Centril/rust that referenced this pull request Mar 26, 2019

Rollup merge of rust-lang#59284 - RalfJung:maybe-uninit, r=sfackler
adjust MaybeUninit API to discussions

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

This comment has been minimized.

Copy link
Contributor

Centril commented Mar 26, 2019

@bors r- due to merge conflict.

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Mar 26, 2019

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

RalfJung added some commits Mar 18, 2019

adjust MaybeUninit API to discussions
uninitialized -> uninit
into_initialized -> assume_init
read_initialized -> read
set -> write

@RalfJung RalfJung force-pushed the RalfJung:maybe-uninit branch from 9374efa to 853ae8d Mar 26, 2019

@RalfJung

This comment has been minimized.

Copy link
Member Author

RalfJung commented Mar 26, 2019

Rebased.

@bors r=sfackler

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Mar 26, 2019

📌 Commit 853ae8d has been approved by sfackler

Centril added a commit to Centril/rust that referenced this pull request Mar 27, 2019

Rollup merge of rust-lang#59284 - RalfJung:maybe-uninit, r=sfackler
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 27, 2019

Auto merge of #59457 - Centril:rollup, r=Centril
Rollup of 13 pull requests

Successful merges:

 - #57293 (Make some lints incremental)
 - #57565 (syntax: Remove warning for unnecessary path disambiguators)
 - #58253 (librustc_driver => 2018)
 - #58581 (Refactor generic parameter encoder functions)
 - #58717 (Add FromStr impl for NonZero types)
 - #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)
 - #59421 (Reject integer suffix when tuple indexing)
 - #59429 (When moving out of a for loop head, suggest borrowing it in nll mode)
 - #59430 (Renames `EvalContext` to `InterpretCx`)
 - #59436 (Update jemalloc-sys to version 0.3.0)
 - #59451 (Add `Default` to `std::alloc::System`)

Failed merges:

r? @ghost

Centril added a commit to Centril/rust that referenced this pull request Mar 27, 2019

Rollup merge of rust-lang#59284 - RalfJung:maybe-uninit, r=sfackler
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

Rollup merge of rust-lang#59284 - RalfJung:maybe-uninit, r=sfackler
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 27, 2019

Auto merge of #59466 - Centril:rollup, r=Centril
Rollup of 17 pull requests

Successful merges:

 - #57293 (Make some lints incremental)
 - #57565 (syntax: Remove warning for unnecessary path disambiguators)
 - #58253 (librustc_driver => 2018)
 - #58717 (Add FromStr impl for NonZero types)
 - #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)
 - #59393 (Refactor tuple comparison tests)
 - #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

cuviper added a commit to cuviper/rust that referenced this pull request Mar 28, 2019

Rollup merge of rust-lang#59284 - RalfJung:maybe-uninit, r=sfackler
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

Auto merge of #59471 - cuviper:rollup, r=cuviper
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

This comment has been minimized.

Copy link
Contributor

jethrogb commented Mar 29, 2019

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

Auto merge of #59513 - Centril:rollup, r=Centril
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

Auto merge of #59513 - Centril:rollup, r=Centril
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 RalfJung:maybe-uninit branch Mar 29, 2019

@RalfJung

This comment has been minimized.

Copy link
Member Author

RalfJung commented Mar 29, 2019

Sorry, seems like I missed one use. :/

matklad added a commit to matklad/rust that referenced this pull request Apr 17, 2019

Auto merge of rust-lang#59513 - Centril:rollup, r=Centril
Rollup of 11 pull requests

Successful merges:

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

Failed merges:

r? @ghost
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.