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 10 pull requests #73369

Merged
merged 51 commits into from
Jun 15, 2020
Merged

Rollup of 10 pull requests #73369

merged 51 commits into from
Jun 15, 2020

Commits on Jun 7, 2020

  1. Configuration menu
    Copy the full SHA
    6f6620b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    95c4899 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9c8f881 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2020

  1. Simply use drop instead of std::mem::drop

    Co-authored-by: LeSeulArtichaut <leseulartichaut@gmail.com>
    poliorcetics and LeSeulArtichaut committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    fdef1a5 View commit details
    Browse the repository at this point in the history
  2. Add methods to go from a nul-terminated Vec<u8> to a CString, checked…

    … and unchecked.
    
    Doc tests have been written and the documentation on the error type
    updated too.
    poliorcetics committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    496818c View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2020

  1. Configuration menu
    Copy the full SHA
    b03164e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1312d30 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2020

  1. Configuration menu
    Copy the full SHA
    88ea7e5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c29b3fa View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7cde07e View commit details
    Browse the repository at this point in the history
  4. fix rebase

    estebank committed Jun 10, 2020
    Configuration menu
    Copy the full SHA
    03552ec View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    7f3bb39 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2020

  1. Configuration menu
    Copy the full SHA
    6b95526 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2020

  1. Configuration menu
    Copy the full SHA
    871513d View commit details
    Browse the repository at this point in the history
  2. make miri InterpCx TyCtxtAt a TyCtxt, and separately remember the roo…

    …t span of the evaluation
    RalfJung committed Jun 12, 2020
    Configuration menu
    Copy the full SHA
    dc6ffae View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0ac6fd0 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    32b01c7 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c0aef6d View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2020

  1. Stabilize Option::zip

    tesuji committed Jun 13, 2020
    Configuration menu
    Copy the full SHA
    8b20928 View commit details
    Browse the repository at this point in the history
  2. Revert heterogeneous SocketAddr PartialEq impls

    These lead to inference regressions (mostly in tests) in code that looks
    like:
    
        let socket = std::net::SocketAddrV4::new(std::net::Ipv4Addr::new(127, 0, 0, 1), 8080);
        assert_eq!(socket, "127.0.0.1:8080".parse().unwrap());
    
    That compiles as of stable 1.44.0 but fails in beta with:
    
        error[E0284]: type annotations needed
         --> src/main.rs:3:41
          |
        3 |     assert_eq!(socket, "127.0.0.1:8080".parse().unwrap());
          |                                         ^^^^^ cannot infer type for type parameter `F` declared on the associated function `parse`
          |
          = note: cannot satisfy `<_ as std::str::FromStr>::Err == _`
        help: consider specifying the type argument in the method call
          |
        3 |     assert_eq!(socket, "127.0.0.1:8080".parse::<F>().unwrap());
          |
    dtolnay committed Jun 13, 2020
    Configuration menu
    Copy the full SHA
    c45231c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6049650 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c6512fd View commit details
    Browse the repository at this point in the history
  5. Apply suggestions from code review

    Co-authored-by: David Tolnay <dtolnay@gmail.com>
    poliorcetics and dtolnay committed Jun 13, 2020
    Configuration menu
    Copy the full SHA
    f747073 View commit details
    Browse the repository at this point in the history
  6. Clarify the scope-related explanation

    Based on the review made by dtolnay.
    poliorcetics committed Jun 13, 2020
    Configuration menu
    Copy the full SHA
    34b3ff0 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    c010e71 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    204c236 View commit details
    Browse the repository at this point in the history
  9. add TcpListener support for HermitCore

    Add basic support of TcpListerner for HermitCore.
    In addition, revise TcpStream to support peer_addr.
    stlankes committed Jun 13, 2020
    Configuration menu
    Copy the full SHA
    71d41d9 View commit details
    Browse the repository at this point in the history
  10. remove unused function

    stlankes committed Jun 13, 2020
    Configuration menu
    Copy the full SHA
    c99116a View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    fd86a84 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2020

  1. Configuration menu
    Copy the full SHA
    2210abe View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5f4eb27 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    685f066 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    47cc5cc View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    d221ffc View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2020

  1. Configuration menu
    Copy the full SHA
    9d596b5 View commit details
    Browse the repository at this point in the history
  2. remove obsolete line

    stlankes committed Jun 15, 2020
    Configuration menu
    Copy the full SHA
    810ba39 View commit details
    Browse the repository at this point in the history
  3. Revert "changes to pass the format check"

    This reverts commit 9d596b5.
    stlankes committed Jun 15, 2020
    Configuration menu
    Copy the full SHA
    aa53a03 View commit details
    Browse the repository at this point in the history
  4. Revert "simplify conversion to IpAddr::V6"

    This reverts commit d221ffc.
    stlankes committed Jun 15, 2020
    Configuration menu
    Copy the full SHA
    9c9f21f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    6c983a7 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    a8e3746 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    76f1581 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#72707 - matthewjasper:rustc_min_spec, r=oli…

    …-obk
    
    Use min_specialization in the remaining rustc crates
    
    This adds a lot of `transmute` calls to replace the unsound uses of specialization.
    It's ugly, but at least it's honest about what's going on.
    
    cc rust-lang#71420, @RalfJung
    RalfJung committed Jun 15, 2020
    Configuration menu
    Copy the full SHA
    eef9356 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#72740 - estebank:recursive-indirection, r=m…

    …atthewjasper
    
    On recursive ADT, provide indirection structured suggestion
    RalfJung committed Jun 15, 2020
    Configuration menu
    Copy the full SHA
    d97e8ca View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#72879 - RalfJung:miri-tctx-at, r=oli-obk

    Miri: avoid tracking current location three times
    
    Miri tracks the current instruction to execute in the call stack, but it also additionally has two `TyCtxtAt` that carry a `Span` that also tracks the current instruction. That is quite silly, so this PR uses `TyCtxt` instead, and then uses a method for computing the current span when a `TyCtxtAt` is needed. Having less redundant (semi-)global state seems like a good improvement to me. :D
    
    To keep the ConstProp errors the same, I had to add the option to `error_to_const_error` to overwrite the span. Also for some reason this changes cycle errors a bit -- not sure if we are now better or worse as giving those queries the right span. (It is unfortunately quite easy to accidentally use `DUMMY_SP` by calling the query on a `TyCtxt` instead of a `TyCtxtAt`.)
    
    r? @oli-obk @eddyb
    RalfJung committed Jun 15, 2020
    Configuration menu
    Copy the full SHA
    f9c8a67 View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#72938 - lzutao:stabilize_option_zip, r=dtolnay

    Stabilize Option::zip
    
    This PR stabilizes the following API:
    
    ```rust
    impl<T> Option<T> {
        pub fn zip<U>(self, other: Option<U>) -> Option<(T, U)>;
    }
    ```
    
    This API has real world usage as seen in <https://grep.app/search?q=-%3E%20Option%3C%5C%28T%2C%5Cs%3FU%5C%29%3E&regexp=true&filter[lang][0]=Rust>.
    
    The `zip_with` method is left unstably as this API is kinda niche
    and it hasn't received much usage in Rust repositories on GitHub.
    
    cc rust-lang#70086
    RalfJung committed Jun 15, 2020
    Configuration menu
    Copy the full SHA
    89eb74d View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#73086 - trevyn:apple-a7, r=nikic

    Rename "cyclone" to "apple-a7" per changes in upstream LLVM
    
    It looks like they intended to keep "cyclone" as a legacy option, but removed it from the list of subtarget features. This created a flood of warnings when targeting aarch64-apple-ios, and probably also created incorrectly optimized artifacts.
    
    See:
    https://reviews.llvm.org/D70779
    https://reviews.llvm.org/D70779#C1703593NL568
    
    LLVM 10 merged into master at:
    rust-lang#67759
    RalfJung committed Jun 15, 2020
    Configuration menu
    Copy the full SHA
    3440957 View commit details
    Browse the repository at this point in the history
  13. Rollup merge of rust-lang#73104 - poliorcetics:explicit-mutex-drop-ex…

    …ample, r=dtolnay
    
    Example about explicit mutex dropping
    
    Fixes rust-lang#67457.
    
    Following the remarks made in rust-lang#73074, I added an example on the main `Mutex` type, with a situation where there is mutable data and a computation result.
    
    In my testing it is effectively needed to explicitly drop the lock, else it deadlocks.
    
    r? @dtolnay because you were the one to review the previous PR.
    RalfJung committed Jun 15, 2020
    Configuration menu
    Copy the full SHA
    7c8b941 View commit details
    Browse the repository at this point in the history
  14. Rollup merge of rust-lang#73139 - poliorcetics:cstring-from-vec-with-…

    …nul, r=dtolnay
    
    Add methods to go from a nul-terminated Vec<u8> to a CString
    
    Fixes rust-lang#73100.
    
    Doc tests have been written and the documentation on the error type
    updated too.
    
    I used `#[stable(feature = "cstring_from_vec_with_nul", since = "1.46.0")]` but I don't know if the version is correct.
    RalfJung committed Jun 15, 2020
    Configuration menu
    Copy the full SHA
    ec6fe42 View commit details
    Browse the repository at this point in the history
  15. Rollup merge of rust-lang#73296 - ehuss:remove-msvc-aux, r=Mark-Simul…

    …acrum
    
    Remove vestigial CI job msvc-aux.
    
    This CI job isn't really doing anything, so it seems prudent to remove it.
    
    For some history:
    * This was introduced in rust-lang#48809 when the msvc job was split in two to keep it under 2 hours (oh the good old days). At the time, this check-aux job did a bunch of things:
        * tidy
        * src/test/pretty
        * src/test/run-pass/pretty
        * src/test/run-fail/pretty
        * src/test/run-pass-valgrind/pretty
        * src/test/run-pass-fulldeps/pretty
        * src/test/run-fail-fulldeps/pretty
    * Tidy was removed in rust-lang#60777.
    * run-pass and run-pass-fulldeps moved to UI in rust-lang#63029
    * src/test/pretty removed in rust-lang#58140
    * src/test/run-fail moved to UI in rust-lang#71185
    * run-fail-fulldeps removed in rust-lang#51285
    
    Over time through attrition, the job was left with one lonely thing: `src/test/run-pass-valgrind/pretty`. And of course, this wasn't actually running the "pretty" tests. The normal `run-pass-valgrind` tests ran, and then when it tried to run in "pretty" mode, all the tests were ignored because compiletest thought nothing had changed (apparently compiletest isn't fingerprinting the mode?  Needs more investigation…). `run-pass-valgrind` is already being run as part of `x86_64-msvc-1`, so there's no need to run it here.
    
    I've taken the liberty of removing `src/test/run-pass-valgrind/pretty` as a distinct test. I'm guessing from the other PR's that the pretty tests should now live in `src/test/pretty`, and that the team has moved away from doing pretty tests on other parts of the `src/test` tree.
    RalfJung committed Jun 15, 2020
    Configuration menu
    Copy the full SHA
    fb75d4a View commit details
    Browse the repository at this point in the history
  16. Rollup merge of rust-lang#73304 - dtolnay:socketeq, r=Mark-Simulacrum

    Revert heterogeneous SocketAddr PartialEq impls
    
    Originally added in rust-lang#72239.
    
    These lead to inference regressions (mostly in tests) in code that looks like:
    
    ```rust
    let socket = SocketAddrV4::new(Ipv4Addr::new(127, 0, 0, 1), 8080);
    assert_eq!(socket, "127.0.0.1:8080".parse().unwrap());
    ```
    
    That compiles as of stable 1.44.0 but fails in beta with:
    
    ```console
    error[E0284]: type annotations needed
     --> src/main.rs:3:41
      |
    3 |     assert_eq!(socket, "127.0.0.1:8080".parse().unwrap());
      |                                         ^^^^^ cannot infer type for type parameter `F` declared on the associated function `parse`
      |
      = note: cannot satisfy `<_ as std::str::FromStr>::Err == _`
    help: consider specifying the type argument in the method call
      |
    3 |     assert_eq!(socket, "127.0.0.1:8080".parse::<F>().unwrap());
      |
    ```
    
    Closes rust-lang#73242.
    RalfJung committed Jun 15, 2020
    Configuration menu
    Copy the full SHA
    202499f View commit details
    Browse the repository at this point in the history
  17. Rollup merge of rust-lang#73331 - hermitcore:listen, r=kennytm

    extend network support for HermitCore
    
    - add basic support of TcpListerner for HermitCore
    - revise TcpStream to support peer_addr
    RalfJung committed Jun 15, 2020
    Configuration menu
    Copy the full SHA
    54bd077 View commit details
    Browse the repository at this point in the history