Skip to content

/rust

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

Rollup of 14 pull requests #52268

Merged
merged 39 commits into from Jul 11, 2018

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
S-waiting-on-bors
Projects
None yet
Milestone
No milestone
8 participants
@Mark-Simulacrum @bors @csmoe @petrochenkov @Emerentius @RalfJung @ljedrz @CAD97
@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Jul 11, 2018

Successful merges:

  • #51614 (Correct suggestion for println)
  • #51952 ( hygiene: Decouple transparencies from expansion IDs)
  • #52193 (step_by: leave time of item skip unspecified)
  • #52207 (improve error message shown for unsafe operations)
  • #52223 (Deny bare trait objects in in src/liballoc)
  • #52224 (Deny bare trait objects in in src/libsyntax)
  • #52239 (Remove sync::Once::call_once 'static bound)
  • #52247 (Deny bare trait objects in in src/librustc)
  • #52248 (Deny bare trait objects in in src/librustc_allocator)
  • #52252 (Deny bare trait objects in in src/librustc_codegen_llvm)
  • #52253 (Deny bare trait objects in in src/librustc_data_structures)
  • #52254 (Deny bare trait objects in in src/librustc_metadata)
  • #52261 (Deny bare trait objects in in src/libpanic_unwind)
  • #52265 (Deny bare trait objects in in src/librustc_codegen_utils)

Failed merges:

r? @ghost

csmoe and others added some commits Jun 17, 2018

@csmoe
Suggestion for print
b79a83b
@csmoe
add span note
Loading status checks…
c999b25
@csmoe
suggests with whole macro call
Loading status checks…
88f475c
@petrochenkov
libsyntax_pos: Tweak some visibilities
01b6d7c
@petrochenkov
hygiene: Decouple transparencies from expansion IDs
94ef9f5
@petrochenkov
Remove fallback to parent modules from lexical resolution
Loading status checks…
fc74e35
@Emerentius
step_by: leave time of item skip unspecified 
this gives us some leeway when optimizing
Loading status checks…
39fcfa8
@RalfJung
improve error message shown for unsafe operations: explain why undefi… 
…ned behavior could arise

Inspired by @gnzlbg at #46043 (comment)
Loading status checks…
f511c5e
@ljedrz
Deny bare trait objects in in src/liballoc
Loading status checks…
296e72f
@ljedrz
Deny bare trait objects in in src/libsyntax
Loading status checks…
e28e487
@ljedrz
Pacify tidy
Loading status checks…
84dadb6
@ljedrz
Add missing dyn in liballoc
Loading status checks…
cd44b3d
@CAD97
remove sync::Once::call_once 'static 
- [std: Rewrite the `sync` modulehttps://github.com/rust-lang/rust/commit/71d4e77db8ad4b6d821da7e5d5300134ac95974e) (Nov 2014)

    ```diff
    -    pub fn doit(&self, f: ||) {
    +    pub fn doit(&'static self, f: ||) {
    ```

    > ```text
    >  The second layer is the layer provided by `std::sync` which is intended to be
    >  the thinnest possible layer on top of `sys_common` which is entirely safe to
    >  use. There are a few concerns which need to be addressed when making these
    >  system primitives safe:
    >
    >    * Once used, the OS primitives can never be **moved**. This means that they
    >      essentially need to have a stable address. The static primitives use
    >      `&'static self` to enforce this, and the non-static primitives all use a
    >      `Box` to provide this guarantee.
    > ```

The author of this diff is @alexcrichton. `sync::Once` contains only a pointer to (privately hidden) `Waiter`s, which are all stack-allocated. The `'static` bound to `sync::Once` is thus unnecessary to guarantee that any OS primitives are non-relocatable.

See https://internals.rust-lang.org/t/sync-once-per-instance/7918 for more context.
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
0f3f292
@ljedrz
Revert borked changes in last commit.
Loading status checks…
217f8fb
@RalfJung
fix typo
Loading status checks…
f68323b
@ljedrz
Deny bare trait objects in in src/librustc
Loading status checks…
48e501f
@ljedrz
Deny bare trait objects in in src/librustc_allocator
Loading status checks…
5ccaaa8
@ljedrz
Deny bare trait objects in in src/librustc_codegen_llvm
Loading status checks…
ea47350
@csmoe
suggest on new snippet
Loading status checks…
790c09e
@ljedrz
Deny bare trait objects in in src/librustc_data_structures
ff65bbe
@ljedrz
Enforce #![deny(bare_trait_objects)] in src/librustc_data_structures … 
…tests
Loading status checks…
bbaf45d
@ljedrz
Deny bare trait objects in in src/librustc_metadata
Loading status checks…
9cffe90
@ljedrz
add a missing `dyn`
Loading status checks…
6cfd49e
@ljedrz
Deny bare trait objects in in src/libpanic_unwind
Loading status checks…
dbab06d
@ljedrz
Deny bare trait objects in in src/librustc_codegen_utils
Loading status checks…
715b885
@Mark-Simulacrum
Rollup merge of #51614 - csmoe:lit_sugg, r=estebank 
Correct suggestion for println

Closes #51585
r? @estebank
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
d2a8a2b
@Mark-Simulacrum
Rollup merge of #51952 - petrochenkov:transmark, r=alexcrichton 
 hygiene: Decouple transparencies from expansion IDs

And remove fallback to parent modules during resolution of names in scope.

This is a breaking change for users of unstable macros 2.0 (both procedural and declarative), code like this:
```rust
#![feature(decl_macro)]

macro m($S: ident) {
    struct $S;
    mod m {
        type A = $S;
    }
}

fn main() {
    m!(S);
}
```
or equivalent
```rust
#![feature(decl_macro)]

macro m($S: ident) {
    mod m {
        type A = $S;
    }
}

fn main() {
    struct S;
    m!(S);
}
```
stops working due to module boundaries being properly enforced.

For proc macro derives this is still reported as a compatibility warning to give `actix_derive`, `diesel_derives` and `palette_derive` time to fix their issues.

Fixes #50504 in accordance with [this comment](#50504 (comment)).
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
322632a
@Mark-Simulacrum
Rollup merge of #52193 - Emerentius:step_by_note, r=alexcrichton 
step_by: leave time of item skip unspecified

This gives us some leeway when optimizing. `StepBy<RangeFrom<_>>` is one case where this is needed.
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
74cc821
@Mark-Simulacrum
Rollup merge of #52207 - RalfJung:unsafety-errors, r=estebank 
improve error message shown for unsafe operations

Add a short explanation saying why undefined behavior could arise. In particular, the error many people got for "creating a pointer to a packed field requires unsafe block" was not worded great -- it lead to people just adding the unsafe block without considering if what they are doing follows the rules.

I am not sure if a "note" is the right thing, but that was the easiest thing to add...

Inspired by @gnzlbg at #46043 (comment)
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
7897ee4
@Mark-Simulacrum
Rollup merge of #52223 - ljedrz:dyn_liballoc, r=cramertj 
Deny bare trait objects in in src/liballoc

Enforce #![deny(bare_trait_objects)] in src/liballoc.
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
d096f6a

Mark-Simulacrum added some commits Jul 11, 2018

@Mark-Simulacrum
Rollup merge of #52224 - ljedrz:dyn_libsyntax, r=oli-obk 
Deny bare trait objects in in src/libsyntax

Enforce `#![deny(bare_trait_objects)]` in `src/libsyntax`.
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
2d49909
@Mark-Simulacrum
Rollup merge of #52239 - CAD97:patch-1, r=alexcrichton 
Remove sync::Once::call_once 'static bound

See https://internals.rust-lang.org/t/sync-once-per-instance/7918 for more context.

Suggested r is @alexcrichton, the one who added the `'static` bound back in 2014. I don't want to officially r? though, if the system would even let me. I'd rather let the system choose the appropriate member since it knows more than I do.

`git blame` history for `sync::Once::call_once`'s signature:

- [std: Second pass stabilization of sync](f3a7ec7) (Dec 2014)

    ```diff
    -    pub fn doit<F>(&'static self, f: F) where F: FnOnce() {
    +    #[stable]
    +    pub fn call_once<F>(&'static self, f: F) where F: FnOnce() {
    ```

- [libstd: use unboxed closures](cdbb3ca) (Dec 2014)

    ```diff
    -    pub fn doit(&'static self, f: ||) {
    +    pub fn doit<F>(&'static self, f: F) where F: FnOnce() {
    ```

- [std: Rewrite the `sync` module](71d4e77) (Nov 2014)

    ```diff
    -    pub fn doit(&self, f: ||) {
    +    pub fn doit(&'static self, f: ||) {
    ```

    > ```text
    >  The second layer is the layer provided by `std::sync` which is intended to be
    >  the thinnest possible layer on top of `sys_common` which is entirely safe to
    >  use. There are a few concerns which need to be addressed when making these
    >  system primitives safe:
    >
    >    * Once used, the OS primitives can never be **moved**. This means that they
    >      essentially need to have a stable address. The static primitives use
    >      `&'static self` to enforce this, and the non-static primitives all use a
    >      `Box` to provide this guarantee.
    > ```

The author of this diff is @alexcrichton. `sync::Once` now contains only a pointer to (privately hidden) `Waiter`s, which are all stack-allocated. The `'static` bound to `sync::Once` is thus unnecessary to guarantee that any OS primitives are non-relocatable.

As the `'static` bound is not required for `sync::Once`'s operation, removing it is strictly more useful. As an example, it allows attaching a one-time operation to instances rather than only to global singletons.
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
b41105b
@Mark-Simulacrum
Rollup merge of #52247 - ljedrz:dyn_librustc, r=oli-obk 
Deny bare trait objects in in src/librustc

Enforce `#![deny(bare_trait_objects)]` in `src/librustc`.
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
2774179
@Mark-Simulacrum
Rollup merge of #52248 - ljedrz:dyn_librustc_allocator, r=oli-obk 
Deny bare trait objects in in src/librustc_allocator

Enforce `#![deny(bare_trait_objects)]` in `src/librustc_allocator`.
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
8d9a6a7
@Mark-Simulacrum
Rollup merge of #52252 - ljedrz:dyn_librustc_codegen_llvm, r=varkor 
Deny bare trait objects in in src/librustc_codegen_llvm

Enforce `#![deny(bare_trait_objects)]` in `src/librustc_codegen_llvm`.
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
dcc536f
@Mark-Simulacrum
Rollup merge of #52253 - ljedrz:dyn_librustc_data_structures, r=cramertj 
Deny bare trait objects in in src/librustc_data_structures

Enforce `#![deny(bare_trait_objects)]` in `src/librustc_data_structures`.
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
59fb178
@Mark-Simulacrum
Rollup merge of #52254 - ljedrz:dyn_librustc_metadata, r=cramertj 
Deny bare trait objects in in src/librustc_metadata

Enforce `#![deny(bare_trait_objects)]` in `src/librustc_metadata`.
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
e6f6608
@Mark-Simulacrum
Rollup merge of #52261 - ljedrz:dyn_libpanic_unwind, r=alexcrichton 
Deny bare trait objects in in src/libpanic_unwind

Enforce `#![deny(bare_trait_objects)]` in `src/libpanic_unwind`.
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
7585bd5
@Mark-Simulacrum
Rollup merge of #52265 - ljedrz:dyn_librustc_codegen_utils, r=oli-obk 
Deny bare trait objects in in src/librustc_codegen_utils

Enforce `#![deny(bare_trait_objects)]` in `src/librustc_codegen_utils`.
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
a0b288e
@Mark-Simulacrum

This comment has been minimized.

Sign in to view
Copy link
Member Author

Mark-Simulacrum commented Jul 11, 2018

@bors r+ p=10
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Jul 11, 2018

📌 Commit a0b288e has been approved by Mark-Simulacrum

@bors bors added the S-waiting-on-bors label Jul 11, 2018

@phansch phansch referenced this pull request Jul 11, 2018

Open

Support defining enabled and disabled lints in a configuration file #5034

@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Jul 11, 2018

⌛️ Testing commit a0b288e with merge 704af2d...

bors added a commit that referenced this pull request Jul 11, 2018

@bors
Auto merge of #52268 - Mark-Simulacrum:rollup, r=Mark-Simulacrum 
Rollup of 14 pull requests

Successful merges:

 - #51614 (Correct suggestion for println)
 - #51952 ( hygiene: Decouple transparencies from expansion IDs)
 - #52193 (step_by: leave time of item skip unspecified)
 - #52207 (improve error message shown for unsafe operations)
 - #52223 (Deny bare trait objects in in src/liballoc)
 - #52224 (Deny bare trait objects in in src/libsyntax)
 - #52239 (Remove sync::Once::call_once 'static bound)
 - #52247 (Deny bare trait objects in in src/librustc)
 - #52248 (Deny bare trait objects in in src/librustc_allocator)
 - #52252 (Deny bare trait objects in in src/librustc_codegen_llvm)
 - #52253 (Deny bare trait objects in in src/librustc_data_structures)
 - #52254 (Deny bare trait objects in in src/librustc_metadata)
 - #52261 (Deny bare trait objects in in src/libpanic_unwind)
 - #52265 (Deny bare trait objects in in src/librustc_codegen_utils)

Failed merges:

r? @ghost
Loading status checks…
704af2d
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Jul 11, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: Mark-Simulacrum
Pushing 704af2d to master...

@bors bors referenced this pull request Jul 11, 2018

Merged

Deny bare trait objects in src/libsyntax #52224

@bors bors merged commit a0b288e into rust-lang:master Jul 11, 2018
2 checks passed

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details

This was referenced Jul 11, 2018

Merged
Merged
Merged
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.