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

Closed
wants to merge 26 commits into from
Closed

Commits on May 30, 2016

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

Commits on Jun 1, 2016

  1. Rewrote "How Safe and Unsafe Interact" Nomicon chapter.

    The previous version of the chapter covered a lot of ground, but was a little
    meandering and hard to follow at times. This draft is intended to be clearer
    and more direct, while still providing the same information as the previous
    version.
    Andrew Brinker committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    00e77d7 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2016

  1. atomic doc: fix statement

    Vtec234 committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    8841f26 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2016

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

Commits on Jun 6, 2016

  1. Configuration menu
    Copy the full SHA
    0f37edb View commit details
    Browse the repository at this point in the history
  2. Remove a gotcha from book/error-handling.md

    The book's "Error handling with Box<Error>" section talks about Box<Error>.
    In the actual example Box<Error + Send + Sync> is used instead so that the
    corresponding From impls could be used to convert a plain string to an error
    type. Rust 1.7 added support for conversion from &str/String to
    Box<Error>, so this gotcha and later references to it can now be removed.
    jviide committed Jun 6, 2016
    Configuration menu
    Copy the full SHA
    75fc40c View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2016

  1. Configuration menu
    Copy the full SHA
    49de80d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    970e15d View commit details
    Browse the repository at this point in the history
  3. Fix issue rust-lang#34101: do not track subcontent of type with dtor …

    …nor gather flags for untracked content.
    
    (Includes a regression test, which needed to go into `compile-fail/`
    due to weaknesses when combining `#[deny(warnings)]` with
    `tcx.sess.span_warn(..)`)
    
    (updated with review feedback from arielb1.)
    pnkfelix committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    4b6a68e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4504df7 View commit details
    Browse the repository at this point in the history
  5. docs: simplify wording

    matklad committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    7abdbd4 View commit details
    Browse the repository at this point in the history
  6. Fixed based on feedback from steveklabnik

    Andrew Brinker committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    af33b30 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2016

  1. Resolving build failure

    imjacobclark committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    0379493 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c39e37a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5439806 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4c5f3a6 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#33895 - AndrewBrinker:master, r=steveklabnik

    Rewrote "How Safe and Unsafe Interact" Nomicon chapter.
    
    The previous version of the chapter covered a lot of ground, but was a little meandering and hard to follow at times. This draft is intended to be clearer and more direct, while still providing the same information as the previous version.
    
    r? @steveklabnik
    Manishearth committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    25c5d92 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#33931 - srinivasreddy:lint_folder, r=Guilla…

    …umeGomez
    
    run rustfmt on librustc_lint folder
    Manishearth committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    94cae0a View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#34046 - Vtec234:fix-atomic-doc, r=steveklabnik

    Fix wrong statement in compare_exchange doc
    
    The documentation for `core::sync::atomic::AtomicSomething::compare_exchange` contains a wrong, or imprecise, statement about the return value. It goes:
    
    The return value is a result indicating whether the new value was written and containing
    the previous value. On success this value is guaranteed to be equal to `new`.
    
    In the second sentence, `this value` is gramatically understood as referring to `return value` from the first sentence. Due to how CAS works, the returned value is always what was in the atomic variable _before_ the operation occurred, not what was written into it during the operation. Hence, the fixed doc should say:
    
    The return value is a result indicating whether the new value was written and containing
    the previous value. On success this value is guaranteed to be equal to `current`.
    
    This version is confirmed by the runnable examples in variants of `AtomicSomething`, e.g.
    
        assert_eq!(some_bool.compare_exchange(true, false, Ordering::Acquire, Ordering::Relaxed),
        Ok(true));
    
    where the returned value is `Ok(current)`. This PR fixes all occurrences of this bug I could find.
    
    An alternative solution would be to modify the second sentence so that it refers to the value _written_ into the Atomic rather than what was there before, in which case it would be correct. Example alternative formulation:
    
    On success the value written into the `bool`/`usize`/`whatever` is guaranteed to be equal to `new`.
    
    r? @steveklabnik
    Manishearth committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    65c7425 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#34088 - srinivasreddy:rustfmt_map.rs, r=nrc

    run rustfmt on map.rs in libcollections/btree folder
    Manishearth committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    11cd6b6 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#34108 - jseyfried:refactor_prelude_injectio…

    …n, r=nrc
    
    Refactor away the prelude injection fold
    
    Instead, just inject `#[prelude_import] use [core|std]::prelude::v1::*;` at the crate root while injecting `extern crate [core|std];` and process `#[no_implicit_prelude]` attributes in `resolve`.
    
    r? @nrc
    Manishearth committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    fc97771 View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#34109 - pnkfelix:fix-issue-34101, r=arielb1

    Fix issue rust-lang#34101
    
    Fix issue rust-lang#34101: do not track subcontent of type with dtor nor gather flags for untracked content.
    
    (Includes a regression test, which needed to go into `compile-fail/`
    due to weaknesses when combining `#[deny(warnings)]` with
    `tcx.sess.span_warn(..)`)
    Manishearth committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    100f082 View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#34129 - jviide:from-string-box-error, r=ste…

    …veklabnik
    
    Remove a gotcha from book/error-handling.md
    
    The book's "Error handling with `Box<Error>`" section talks about `Box<Error>`. In the actual example `Box<Error + Send + Sync>` is used instead so that the corresponding From impls could be used to convert a plain string to an error type. Rust 1.7 added support for conversion from `&str`/`String` to
    `Box<Error>`, so this gotcha and later references to it can now be removed.
    
    r? @steveklabnik
    Manishearth committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    c71db95 View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#34133 - m-decoster:master, r=GuillaumeGomez

    Add explanations for E0503 and E0508.
    
    (cannot use `..` because it was mutably borrowed, cannot move out of type `..`, a non-copy fixed-size array)
    
    Part of rust-lang#32777.
    Manishearth committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    c0f3647 View commit details
    Browse the repository at this point in the history
  13. Rollup merge of rust-lang#34136 - imjacobclark:ice-test-case-25579, r…

    …=nikomatsakis
    
    Test case for borrowk ICE rust-lang#25579
    
    r? @nikomatsakis
    
    Fixes rust-lang#25579
    Manishearth committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    20f4d99 View commit details
    Browse the repository at this point in the history
  14. Rollup merge of rust-lang#34145 - matklad:any-docs, r=steveklabnik

    docs: simplify wording
    
    It took me more then a moment to decipher "with no non-`'static`" thing :)
    
    "`'static` type" should say the same thing more clearly.
    
    r? @steveklabnik
    Manishearth committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    c7b9ee2 View commit details
    Browse the repository at this point in the history