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 7 pull requests #63428

Merged
merged 30 commits into from
Aug 10, 2019
Merged

Rollup of 7 pull requests #63428

merged 30 commits into from
Aug 10, 2019

Commits on Aug 8, 2019

  1. Configuration menu
    Copy the full SHA
    3a6a29b View commit details
    Browse the repository at this point in the history
  2. Add test for issue 36804

    jackh726 committed Aug 8, 2019
    Configuration menu
    Copy the full SHA
    322a7d6 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2019

  1. Configuration menu
    Copy the full SHA
    3d231ac View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    77bfd7f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c076392 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    799b13a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    4fbbf99 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    01a6139 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    94fe8a3 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    195d837 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    b7f7756 View commit details
    Browse the repository at this point in the history
  10. review comments

    estebank committed Aug 9, 2019
    Configuration menu
    Copy the full SHA
    0d53f69 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    efa62d6 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    52da091 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    5a54945 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    33d1082 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    bc1a4f5 View commit details
    Browse the repository at this point in the history
  16. fix tests

    estebank committed Aug 9, 2019
    Configuration menu
    Copy the full SHA
    45a5bc7 View commit details
    Browse the repository at this point in the history
  17. More explicit diagnostic when using a vec![] in a pattern

    ```
    error: unexpected `(` after qualified path
      --> $DIR/vec-macro-in-pattern.rs:3:14
       |
    LL |         Some(vec![x]) => (),
       |              ^^^^^^^
       |              |
       |              unexpected `(` after qualified path
       |              in this macro invocation
       |              use a slice pattern here instead
       |
       = help: for more information, see https://doc.rust-lang.org/edition-guide/rust-2018/slice-patterns.html
       = note: this warning originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
    ```
    estebank committed Aug 9, 2019
    Configuration menu
    Copy the full SHA
    7c96d90 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    75c5ad2 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    4dd96d2 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    b9865d9 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    cbcc7dd View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2019

  1. Rollup merge of rust-lang#63056 - petrochenkov:macstd2, r=alexcrichton

    Give built-in macros stable addresses in the standard library
    
    Continuation of rust-lang#62086.
    
    Derive macros corresponding to traits from libcore are now available through the same paths as those traits:
    - `Clone` - `{core,std}::clone::Clone`
    - `PartialEq` - `{core,std}::cmp::PartialEq`
    - `Eq` - `{core,std}::cmp::Eq`
    - `PartialOrd` - `{core,std}::cmp::PartialOrd`
    - `Ord` - `{core,std}::cmp::Ord`
    - `Default` - `{core,std}::default::Default`
    - `Debug` - `{core,std}::fmt::Debug`
    - `Hash` - `{core,std}::hash::Hash`
    - `Copy` - `{core,std}::marker::Copy`
    
    Fn-like built-in macros are now available through libcore and libstd's root module, by analogy with non-builtin macros defined by libcore and libstd:
    ```rust
    {core,std}::{
        __rust_unstable_column,
        asm,
        assert,
        cfg,
        column,
        compile_error,
        concat,
        concat_idents,
        env,
        file,
        format_args,
        format_args_nl,
        global_asm,
        include,
        include_bytes,
        include_str,
        line,
        log_syntax,
        module_path,
        option_env,
        stringify,
        trace_macros,
    }
    ```
    
    Derive macros without a corresponding trait in libcore or libstd are still available only through prelude (also see rust-lang#62507).
    Attribute macros also keep being available only through prelude, mostly because they don't have an existing practice to follow. An advice from the library team on their eventual placement would be appreciated.
    ```rust
        RustcDecodable,
        RustcEncodable,
        bench,
        global_allocator,
        test,
        test_case,
    ```
    
    r? @alexcrichton
    Centril authored Aug 10, 2019
    Configuration menu
    Copy the full SHA
    eb44561 View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#63337 - estebank:break-ee0308, r=Centril

    Tweak mismatched types error
    
    - Change expected/found for type mismatches in `break`
    - Be more accurate when talking about diverging match arms
    - Tweak wording of function without a return value
    - Suggest calling bare functions when their return value can be coerced to the expected type
    - Give more parsing errors when encountering `foo(_, _, _)`
    
    Fix rust-lang#51767, fix rust-lang#62677, fix rust-lang#63136, cc rust-lang#37384, cc rust-lang#35241, cc rust-lang#51669.
    Centril authored Aug 10, 2019
    Configuration menu
    Copy the full SHA
    52f9e80 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#63350 - iluuu1994:use-associated-type-bound…

    …s, r=Centril
    
    Use associated_type_bounds where applicable - closes rust-lang#61738
    Centril authored Aug 10, 2019
    Configuration menu
    Copy the full SHA
    6743ad6 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#63394 - jackh726:issue-36804, r=jonas-schie…

    …vink
    
    Add test for issue 36804
    
    I slightly reduced the repro that ICEs on nightly-2017-01-20.
    
    Closes rust-lang#36804
    Centril authored Aug 10, 2019
    Configuration menu
    Copy the full SHA
    5ed195b View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#63399 - estebank:vec-in-pat, r=Centril

    More explicit diagnostic when using a `vec![]` in a pattern
    
    ```
    error: unexpected `(` after qualified path
      --> $DIR/vec-macro-in-pattern.rs:3:14
       |
    LL |         Some(vec![x]) => (),
       |              ^^^^^^^
       |              |
       |              unexpected `(` after qualified path
       |              in this macro invocation
       |              use a slice pattern here instead
       |
       = help: for more information, see https://doc.rust-lang.org/edition-guide/rust-2018/slice-patterns.html
       = note: this warning originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
    ```
    
    Fix rust-lang#61933.
    Centril authored Aug 10, 2019
    Configuration menu
    Copy the full SHA
    9e613c7 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#63419 - RalfJung:typeid, r=alexcrichton

    check against more collisions for TypeId of fn pointer
    
    Cc rust-lang/rfcs#2738 (comment)
    Centril authored Aug 10, 2019
    Configuration menu
    Copy the full SHA
    a029ce8 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#63423 - estebank:priv-tuple, r=zackmdavis

    Mention that tuple structs are private if any of their fields are
    
    CC rust-lang#39703
    Centril authored Aug 10, 2019
    Configuration menu
    Copy the full SHA
    019f6fe View commit details
    Browse the repository at this point in the history