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

Rollup of 6 pull requests #60708

Merged
merged 20 commits into from
May 10, 2019
Merged

Rollup of 6 pull requests #60708

merged 20 commits into from
May 10, 2019

Commits on May 10, 2019

  1. Add InternedString::with2.

    This lets comparisons occur with a single access to the interner,
    instead of two.
    nnethercote committed May 10, 2019
    Configuration menu
    Copy the full SHA
    8c465b4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c2cae7b View commit details
    Browse the repository at this point in the history
  3. Add various comments.

    Lots of details I wish I'd known when I first looked at this code.
    nnethercote committed May 10, 2019
    Configuration menu
    Copy the full SHA
    0e27c36 View commit details
    Browse the repository at this point in the history
  4. Remove the From<InternedString> for String impl.

    It's not used.
    nnethercote committed May 10, 2019
    Configuration menu
    Copy the full SHA
    cb7eacb View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    e53bb1a View commit details
    Browse the repository at this point in the history
  6. Extend existing test for nested mut patterns.

    At request of `@centril`, this commit extends the existing test added
    by rust-lang#60676 to include nested `mut` patterns.
    davidtwco committed May 10, 2019
    Configuration menu
    Copy the full SHA
    d28b7af View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    c81780b View commit details
    Browse the repository at this point in the history
  8. Update mailmap for mati865

    mati865 committed May 10, 2019
    Configuration menu
    Copy the full SHA
    8fbe1ed View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    5b6bda3 View commit details
    Browse the repository at this point in the history
  10. Add uninhabitedness tests w/ #[non_exhaustive].

    This commit adds tests checking that uninhabited non-exhaustive types
    are considered inhabited when used in another crate.
    davidtwco committed May 10, 2019
    Configuration menu
    Copy the full SHA
    0db087e View commit details
    Browse the repository at this point in the history
  11. Fix inhabitedness of non-exhaustive variants.

    This commit ensures that non-exhaustive variants are considered
    inhabited when used in extern crates.
    davidtwco committed May 10, 2019
    Configuration menu
    Copy the full SHA
    0d034a2 View commit details
    Browse the repository at this point in the history
  12. Fix uninhabitedness of non-exhaustive enums.

    This commit ensures that non-exhaustive enums are considered inhabited
    when used in extern crates.
    davidtwco committed May 10, 2019
    Configuration menu
    Copy the full SHA
    8838b91 View commit details
    Browse the repository at this point in the history
  13. Move uninhabited tests into subdirectory.

    This commit just tries to tidy up a little.
    davidtwco committed May 10, 2019
    Configuration menu
    Copy the full SHA
    214f977 View commit details
    Browse the repository at this point in the history
  14. Add a bunch more tests.

    davidtwco committed May 10, 2019
    Configuration menu
    Copy the full SHA
    1f0fb03 View commit details
    Browse the repository at this point in the history
  15. Rollup merge of rust-lang#60529 - davidtwco:rfc-2008-uninhabited, r=p…

    …etrochenkov
    
    RFC 2008: Uninhabitedness fixes for enum variants and tests
    
    Part of rust-lang#44109.
    
    At the request of @Centril, this PR adds tests asserting that uninhabited non-exhaustive types are considered inhabited in extern crates. In adding these tests, I fixed an oversight in the implementation of RFC 2008 on enum variants that resulted in non-exhaustive enum variants being considered uninhabited in extern crates.
    
    Before this PR, these lines would error:
    
    ```rust
    // extern crate
    pub enum UninhabitedVariants {
        #[non_exhaustive] Tuple(!),
        #[non_exhaustive] Struct { x: ! }
    }
    
    pub enum PartiallyInhabitedVariants {
        Tuple(u8),
        #[non_exhaustive] Struct { x: ! }
    }
    
    // current crate
    match uninhabited_variant() /* fn() -> Option<UninhabitedVariants> */ {
        Some(_x) => (), //~ ERROR unreachable pattern
        None => (),
    }
    
    while let PartiallyInhabitedVariants::Struct { x, .. } = partially_inhabited_variant() /* fn() -> PartiallyInhabitedVariants */ {
        //~^ ERROR unreachable pattern
    }
    ```
    
    cc @Centril
    r? @petrochenkov
    Centril authored May 10, 2019
    Configuration menu
    Copy the full SHA
    d94cb9f View commit details
    Browse the repository at this point in the history
  16. Rollup merge of rust-lang#60620 - mark-i-m:transcribe-2, r=petrochenkov

    Fix a couple of FIXMEs in ext::tt::transcribe
    
    _Blocked on #60618_
    
    A crater run would be nice to make sure my understanding is correct. A quick google search seems to indicate these are extremely rare errors if they are possible (which I don't believe they are).
    
    r? @petrochenkov
    
    cc rust-lang#2887 (there is only one FIXME left and it is hygiene-related)
    Centril authored May 10, 2019
    Configuration menu
    Copy the full SHA
    20dff29 View commit details
    Browse the repository at this point in the history
  17. Rollup merge of rust-lang#60659 - nnethercote:tweak-Symbol-and-Intern…

    …edString, r=Zoxc
    
    Tweak `Symbol` and `InternedString`
    
    Some minor improvements to speed and code cleanliness.
    
    r? @Zoxc
    Centril authored May 10, 2019
    Configuration menu
    Copy the full SHA
    bc8c782 View commit details
    Browse the repository at this point in the history
  18. Rollup merge of rust-lang#60692 - davidtwco:pr-60676-followup, r=Centril

    Extend rust-lang#60676 test for nested mut patterns.
    
    At request of @Centril, this commit extends the existing test added by rust-lang#60676 to include nested `mut` patterns.
    
    cc @Centril
    Centril authored May 10, 2019
    Configuration menu
    Copy the full SHA
    ec6afb1 View commit details
    Browse the repository at this point in the history
  19. Rollup merge of rust-lang#60697 - hellow554:fix_60629, r=michaelwoeri…

    …ster
    
    add regression test for rust-lang#60629
    
    This bug was fixed, but I don't know which one. (I think it even doesn't matter at all).
    
    Added a regression test.
    
    ```
    op@OP ~/m/r/s/t/incremental> rustc --version
    rustc 1.35.0-nightly (acd8dd6 2019-04-05)
    op@OP ~/m/r/s/t/incremental> rustc -C incremental= --cfg rpass1 issue-60629.rs
    warning: struct is never constructed: `A`
     --> issue-60629.rs:3:1
      |
    3 | struct A;
      | ^^^^^^^^^
      |
      = note: #[warn(dead_code)] on by default
    
    op@OP ~/m/r/s/t/incremental> rustc -C incremental= --cfg rpass2 issue-60629.rs
    error: internal compiler error: src/librustc/ty/query/plumbing.rs:1195: Cannot force dep node: coherent_trait(core[c27c]::ops[0]::drop[0]::Drop[0])
    
    thread 'rustc' panicked at 'Box<Any>', src/librustc_errors/lib.rs:635:9
    note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
    error: aborting due to previous error
    
    note: the compiler unexpectedly panicked. this is a bug.
    
    note: we would appreciate a bug report: https:/rust-lang/rust/blob/master/CONTRIBUTING.md#bug-reports
    
    note: rustc 1.35.0-nightly (acd8dd6 2019-04-05) running on x86_64-unknown-linux-gnu
    
    note: compiler flags: -C incremental
    ```
    
    with latest nightly it does not crash anymore, so nothing more to do.
    
    Fixes rust-lang#60629
    
    (accidentally removed the remote branch on github, therefore GH closed the other PR.)
    
    r? @nikomatsakis
    Centril authored May 10, 2019
    Configuration menu
    Copy the full SHA
    0b63f55 View commit details
    Browse the repository at this point in the history
  20. Rollup merge of rust-lang#60701 - mati865:mailmap, r=Mark-Simulacrum

    Update mailmap for mati865
    Centril authored May 10, 2019
    Configuration menu
    Copy the full SHA
    329275a View commit details
    Browse the repository at this point in the history