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 #47214

Merged
merged 23 commits into from
Jan 5, 2018
Merged

Rollup of 10 pull requests #47214

merged 23 commits into from
Jan 5, 2018

Commits on Dec 27, 2017

  1. Configuration menu
    Copy the full SHA
    a8d107b View commit details
    Browse the repository at this point in the history
  2. Disable printing of error message on file descriptor 2 on CloudABI.

    As CloudABI is a capability-based runtime environment, file descriptors
    are the mechanism that grants rights to a process. These file
    descriptors may be passed into processes on startup using a utility
    called cloudabi-run. Unlike the POSIX shell, cloudabi-run does not
    follow the UNIX model where file descriptors 0, 1 and 2 represent stdin,
    stdout and stderr. There can be arbitrary many (or few) file descriptors
    that can be provided. For this reason, CloudABI's C library also doesn't
    define STD*_FILENO. liblibc should also not declare these.
    
    Disable the code in liballoc_system that tries to print error messages
    over file descriptor 2. For now, let's keep this function quiet. We'll
    see if we can think of some other way to log this in the future.
    EdSchouten committed Dec 27, 2017
    Configuration menu
    Copy the full SHA
    838fb4a View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2017

  1. Build the right platform module on CloudABI.

    After rust-lang#47089 lands, CloudABI will no longer be considered UNIX. We need
    to pick the right allocator flavour now.
    EdSchouten committed Dec 31, 2017
    Configuration menu
    Copy the full SHA
    c661e38 View commit details
    Browse the repository at this point in the history

Commits on Jan 1, 2018

  1. Use the right TLS model for CloudABI.

    CloudABI doesn't do dynamic linking. For this reason, there is no need
    to handle any other TLS model than local-exec. CloudABI's C library
    doesn't provide a __tls_get_addr() function to do Dynamic TLS.
    
    By forcing local-exec to be used here, we ensure that we don't generate
    function calls to __tls_get_addr().
    EdSchouten committed Jan 1, 2018
    Configuration menu
    Copy the full SHA
    4fe167a View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2018

  1. Configuration menu
    Copy the full SHA
    2b9add2 View commit details
    Browse the repository at this point in the history
  2. Span::resolved_at and Span::located_at to combine behavior of two spans

    Proc macro spans serve two mostly unrelated purposes: controlling name
    resolution and controlling error messages. It can be useful to mix the
    name resolution behavior of one span with the line/column error message
    locations of a different span.
    
    In particular, consider the case of a trait brought into scope within
    the def_site of a custom derive. I want to invoke trait methods on the
    fields of the user's struct. If the field type does not implement the
    right trait, I want the error message to underline the corresponding
    struct field.
    
    Generating the method call with the def_site span is not ideal -- it
    compiles and runs but error messages sadly always point to the derive
    attribute like we saw with Macros 1.1.
    
    ```
      |
    4 | #[derive(HeapSize)]
      |          ^^^^^^^^
    ```
    
    Generating the method call with the same span as the struct field's
    ident or type is not correct -- it shows the right underlines but fails
    to resolve to the trait in scope at the def_site.
    
    ```
      |
    7 |     bad: std::thread::Thread,
      |     ^^^^^^^^^^^^^^^^^^^^^^^^
    ```
    
    The correct span for the method call is one that combines the def_site's
    name resolution with the struct field's line/column.
    
    ```
    field.span.resolved_at(Span::def_site())
    
    // equivalently
    Span::def_site().located_at(field.span)
    ```
    
    Adding both because which one is more natural will depend on context.
    dtolnay committed Jan 3, 2018
    Configuration menu
    Copy the full SHA
    000e907 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    47e18e0 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    50989cd View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    05949b0 View commit details
    Browse the repository at this point in the history
  6. Remove T: Ord bound from BTreeSet::{is_empty, len}

    Stjepan Glavina committed Jan 3, 2018
    Configuration menu
    Copy the full SHA
    6076cf6 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2018

  1. Make examples equivalent

    The example with the ? operator was missing file.write_all
    aheart authored Jan 4, 2018
    Configuration menu
    Copy the full SHA
    922f061 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8fc4a24 View commit details
    Browse the repository at this point in the history
  3. rustbuild: Don't allow stable bootstrap from dev

    I forgot to update the bootstrap compiler for the 1.23.0 release so let's make
    sure it doesn't happen again!
    alexcrichton committed Jan 4, 2018
    Configuration menu
    Copy the full SHA
    0e795a2 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2018

  1. Rollup merge of rust-lang#47030 - ollie27:stab, r=alexcrichton

    Correct a few stability attributes
    
    * The extra impls for `ManuallyDrop` were added in rust-lang#44310 which was only stabilised in 1.22.0.
    * The impls for `SliceIndex` were stabilised in rust-lang#43373 but as `RangeInclusive` and `RangeToInclusive` are still unstable the impls should remain unstable.
    * The `From` impls for atomic integers were added in rust-lang#45610 but most atomic integers are still unstable.
    * The `shared_from_slice2` impls were added in rust-lang#45990 but they won't be stable until 1.24.0.
    * The `Mutex` and `RwLock` impls were added in rust-lang#46082 but won't be stable until 1.24.0.
    kennytm authored Jan 5, 2018
    Configuration menu
    Copy the full SHA
    63c8e0c View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#47033 - EdSchouten:cloudabi-oom, r=kennytm

    Disable printing of error message on file descriptor 2 on CloudABI.
    
    As CloudABI is a capability-based runtime environment, file descriptors
    are the mechanism that grants rights to a process. These file
    descriptors may be passed into processes on startup using a utility
    called cloudabi-run. Unlike the POSIX shell, cloudabi-run does not
    follow the UNIX model where file descriptors 0, 1 and 2 represent stdin,
    stdout and stderr. There can be arbitrary many (or few) file descriptors
    that can be provided. For this reason, CloudABI's C library also doesn't
    define STD*_FILENO. liblibc should also not declare these.
    
    Disable the code in liballoc_system that tries to print error messages
    over file descriptor 2. For now, let's keep this function quiet. We'll
    see if we can think of some other way to log this in the future.
    kennytm authored Jan 5, 2018
    Configuration menu
    Copy the full SHA
    016f7f4 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#47110 - EdSchouten:cloudabi-tls, r=kennytm

    Use the right TLS model for CloudABI.
    
    CloudABI doesn't do dynamic linking. For this reason, there is no need
    to handle any other TLS model than local-exec. CloudABI's C library
    doesn't provide a __tls_get_addr() function to do Dynamic TLS.
    
    By forcing local-exec to be used here, we ensure that we don't generate
    function calls to __tls_get_addr().
    kennytm authored Jan 5, 2018
    Configuration menu
    Copy the full SHA
    26d129c View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#47149 - dtolnay:spans, r=jseyfried

    Span::resolved_at and Span::located_at to combine behavior of two spans
    
    Proc macro spans serve two mostly unrelated purposes: controlling name resolution and controlling error messages. It can be useful to mix the name resolution behavior of one span with the line/column error message locations of a different span.
    
    In particular, consider the case of a trait brought into scope within the def_site of a custom derive. I want to invoke trait methods on the fields of the user's struct. If the field type does not implement the right trait, I want the error message to underline the corresponding struct field.
    
    Generating the method call with the def_site span is not ideal -- it compiles and runs but error messages sadly always point to the derive attribute like we saw with Macros 1.1.
    
    ```
      |
    4 | #[derive(HeapSize)]
      |          ^^^^^^^^
    ```
    
    Generating the method call with the same span as the struct field's ident or type is not correct -- it shows the right underlines but fails to resolve to the trait in scope at the def_site.
    
    ```
      |
    7 |     bad: std::thread::Thread,
      |     ^^^^^^^^^^^^^^^^^^^^^^^^
    ```
    
    The correct span for the method call is one that combines the def_site's name resolution with the struct field's line/column.
    
    ```rust
    field.span.resolved_at(Span::def_site())
    
    // equivalently
    Span::def_site().located_at(field.span)
    ```
    
    Adding both because which one is more natural will depend on context.
    
    Addresses rust-lang#38356 (comment). r? @jseyfried
    kennytm authored Jan 5, 2018
    Configuration menu
    Copy the full SHA
    2ac50fe View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#47150 - dtolnay:join, r=jseyfried

    Return None from Span::join if in different files
    
    Fixes rust-lang#47148. r? @abonander
    kennytm authored Jan 5, 2018
    Configuration menu
    Copy the full SHA
    5a5b16a View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#47160 - rust-lang:steveklabnik-patch-1, r=a…

    …lexcrichton
    
    This isn't in Rust 1.23
    
    r? @alexcrichton
    kennytm authored Jan 5, 2018
    Configuration menu
    Copy the full SHA
    a5dd5fe View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#47162 - stjepang:cleanup-btreeset, r=alexcr…

    …ichton
    
    Remove `T: Ord` bound from `BTreeSet::{is_empty, len}`
    
    This change makes the API for `BTreeSet` more consistent with `BTreeMap`, where `BTreeMap::{is_empty, len}` don't require `T: Ord` either.
    
    Also, it reduces the number of `impl`s for `BTreeSet`, making the generated documentation look much cleaner. Closes rust-lang#47138.
    
    cc @rust-lang/libs
    kennytm authored Jan 5, 2018
    Configuration menu
    Copy the full SHA
    ff2f328 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#47182 - aheart:master, r=steveklabnik

    Equivalent example for ? operator
    
    The example with the ? operator in the documentation for try! macro was missing file.write_all.
    Now all three examples are consistent.
    kennytm authored Jan 5, 2018
    Configuration menu
    Copy the full SHA
    1fea751 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#47198 - dzamlo:patch-2, r=frewsxcv

    Fix an error in std::process documentation
    kennytm authored Jan 5, 2018
    Configuration menu
    Copy the full SHA
    71c8e10 View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#47199 - alexcrichton:stable-no-dev, r=kennytm

    rustbuild: Don't allow stable bootstrap from dev
    
    I forgot to update the bootstrap compiler for the 1.23.0 release so let's make
    sure it doesn't happen again!
    kennytm authored Jan 5, 2018
    Configuration menu
    Copy the full SHA
    3fcb995 View commit details
    Browse the repository at this point in the history