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

Rolling up PRs in the queue #20436

Merged
merged 69 commits into from
Jan 2, 2015
Merged

Rolling up PRs in the queue #20436

merged 69 commits into from
Jan 2, 2015

Commits on Dec 24, 2014

  1. Guide changes: Generics and Traits sections

    Mostly copy-editing, clarification---in particular, monomorphization
    mrhota committed Dec 24, 2014
    Configuration menu
    Copy the full SHA
    daed54d View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2014

  1. Fixed a small typo

    tivervac committed Dec 25, 2014
    1 Configuration menu
    Copy the full SHA
    17bdc3f View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2014

  1. std: Stabilize the prelude module

    This commit is an implementation of [RFC 503][rfc] which is a stabilization
    story for the prelude. Most of the RFC was directly applied, removing reexports.
    Some reexports are kept around, however:
    
    * `range` remains until range syntax has landed to reduce churn.
    * `Path` and `GenericPath` remain until path reform lands. This is done to
      prevent many imports of `GenericPath` which will soon be removed.
    * All `io` traits remain until I/O reform lands so imports can be rewritten all
      at once to `std::io::prelude::*`.
    
    This is a breaking change because many prelude reexports have been removed, and
    the RFC can be consulted for the exact list of removed reexports, as well as to
    find the locations of where to import them.
    
    [rfc]: https://github.com/rust-lang/rfcs/blob/master/text/0503-prelude-stabilization.md
    [breaking-change]
    
    Closes rust-lang#20068
    alexcrichton committed Dec 29, 2014
    Configuration menu
    Copy the full SHA
    c32d03f View commit details
    Browse the repository at this point in the history
  2. Properly deal with Ordering in the guide

    Now that it's been removed from the prelude, we need to treat things differently.
    
    Fixes rust-lang#17967
    steveklabnik authored and alexcrichton committed Dec 29, 2014
    Configuration menu
    Copy the full SHA
    e76bd7e View commit details
    Browse the repository at this point in the history
  3. fixes

    alexcrichton committed Dec 29, 2014
    Configuration menu
    Copy the full SHA
    bb8f4fc View commit details
    Browse the repository at this point in the history
  4. std: Second pass stabilization for comm

    This commit is a second pass stabilization for the `std::comm` module,
    performing the following actions:
    
    * The entire `std::comm` module was moved under `std::sync::mpsc`. This movement
      reflects that channels are just yet another synchronization primitive, and
      they don't necessarily deserve a special place outside of the other
      concurrency primitives that the standard library offers.
    * The `send` and `recv` methods have all been removed.
    * The `send_opt` and `recv_opt` methods have been renamed to `send` and `recv`.
      This means that all send/receive operations return a `Result` now indicating
      whether the operation was successful or not.
    * The error type of `send` is now a `SendError` to implement a custom error
      message and allow for `unwrap()`. The error type contains an `into_inner`
      method to extract the value.
    * The error type of `recv` is now `RecvError` for the same reasons as `send`.
    * The `TryRecvError` and `TrySendError` types have had public reexports removed
      of their variants and the variant names have been tweaked with enum
      namespacing rules.
    * The `Messages` iterator is renamed to `Iter`
    
    This functionality is now all `#[stable]`:
    
    * `Sender`
    * `SyncSender`
    * `Receiver`
    * `std::sync::mpsc`
    * `channel`
    * `sync_channel`
    * `Iter`
    * `Sender::send`
    * `Sender::clone`
    * `SyncSender::send`
    * `SyncSender::try_send`
    * `SyncSender::clone`
    * `Receiver::recv`
    * `Receiver::try_recv`
    * `Receiver::iter`
    * `SendError`
    * `RecvError`
    * `TrySendError::{mod, Full, Disconnected}`
    * `TryRecvError::{mod, Empty, Disconnected}`
    * `SendError::into_inner`
    * `TrySendError::into_inner`
    
    This is a breaking change due to the modification of where this module is
    located, as well as the changing of the semantics of `send` and `recv`. Most
    programs just need to rename imports of `std::comm` to `std::sync::mpsc` and
    add calls to `unwrap` after a send or a receive operation.
    
    [breaking-change]
    alexcrichton committed Dec 29, 2014
    Configuration menu
    Copy the full SHA
    bc83a00 View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2014

  1. Configuration menu
    Copy the full SHA
    f1b6401 View commit details
    Browse the repository at this point in the history
  2. fix "make install"

    There seems to be a problem introduced by
    8b3c676 that causes "make install"
    to fail when the build is not configured to skip doc building.
    dcrewi committed Dec 31, 2014
    Configuration menu
    Copy the full SHA
    714a2c6 View commit details
    Browse the repository at this point in the history
  3. std: Second pass stabilization for thread_local

    This commit performs a second pass over the `std::thread_local` module. Most of
    the functionality remains explicitly unstable, but the specific actions taken
    were:
    
    * `thread_local` is now stable
    * `thread_local!` is now stable
    * `thread_local::Key` is now stable
    * `thread_local::Key::with` is now stable
    * `thread_local::Key::destroyed` is deprecated in favor of a more general
      `state` function
    * `thread_local::Key::state` was added to query the three states that a key can
      be in: uninitialized, valid, or destroyed. This function, and the
      corresponding `State` enum, are both marked unstable as we may wish to expand
      it later on.
    * `thread_local::scoped` is entirely unstable. There hasn't been a whole lot of
      usage of this module in the standard distribution, so it remains unstable at
      this time.
    
    Note that while the structure `Key` is marked stable, it is currently forced to
    expose all of its implementation details due to the use of
    construction-via-macro. The use of construction-via-macro is currently required
    in order to place the `#[thread_local]` attribute on static in a
    platform-specific manner. These stability attributes were assigned assuming that
    it will be acceptable to tweak the implementation of `Key` in the future.
    alexcrichton committed Dec 31, 2014
    Configuration menu
    Copy the full SHA
    be11aa6 View commit details
    Browse the repository at this point in the history

Commits on Jan 1, 2015

  1. rustc: Re-jigger -L and -l for MSYS compatibility

    As discovered in rust-lang#20376, the MSYS shell will silently rewrite arguemnts that
    look like unix paths into their windows path counterparts for compatibility, but
    the recently added `:kind` syntax added to the `-L` flag does not allow for this
    form of rewriting. This means that the syntax can be difficult to use at an MSYS
    prompt, as well as causing tests to fail when run manuall right now.
    
    This commit takes the other option presented in the original issue to prefix the
    path with `kind=` instead of suffixing it with `:kind`. For consistence, the
    `-l` flag is also now migrating to `kind=name`.
    
    This is a breaking change due to the *removal* of behavior with `-L`. All code
    using `:kind` should now pass `kind=` for `-L` arguments. This is not currently,
    but will become, a breaking change for `-l` flags. The old `name:kind` syntax is
    still accepted, but all code should update to `kind=name`.
    
    [breaking-change]
    Closes rust-lang#20376
    alexcrichton committed Jan 1, 2015
    Configuration menu
    Copy the full SHA
    a6f5b98 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d06b705 View commit details
    Browse the repository at this point in the history
  3. Remove core::iter::MinMaxResult::* public reexport

    Part of rust-lang#19253
    
    [breaking-change]
    frewsxcv committed Jan 1, 2015
    Configuration menu
    Copy the full SHA
    f9ce6f5 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b16111f View commit details
    Browse the repository at this point in the history
  5. Reimplement a minor optimization in String::from_utf8_lossy that avoi…

    …ds having to loop the slice from the begining.
    daramos committed Jan 1, 2015
    Configuration menu
    Copy the full SHA
    8aeefbb View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    637f2c5 View commit details
    Browse the repository at this point in the history
  7. 1 Configuration menu
    Copy the full SHA
    182db6e View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    7a11b9a View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    77723d2 View commit details
    Browse the repository at this point in the history
  10. mk: Put the version number somewhere discoverable in the installer

    The binaries for some release channels to not contain the version number,
    which makes it hard for scripts to determine the version number.
    brson committed Jan 1, 2015
    Configuration menu
    Copy the full SHA
    d539149 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2015

  1. std: Second pass stabilization of sync

    This pass performs a second pass of stabilization through the `std::sync`
    module, avoiding modules/types that are being handled in other PRs (e.g.
    mutexes, rwlocks, condvars, and channels).
    
    The following items are now stable
    
    * `sync::atomic`
    * `sync::atomic::ATOMIC_BOOL_INIT` (was `INIT_ATOMIC_BOOL`)
    * `sync::atomic::ATOMIC_INT_INIT` (was `INIT_ATOMIC_INT`)
    * `sync::atomic::ATOMIC_UINT_INIT` (was `INIT_ATOMIC_UINT`)
    * `sync::Once`
    * `sync::ONCE_INIT`
    * `sync::Once::call_once` (was `doit`)
      * C == `pthread_once(..)`
      * Boost == `call_once(..)`
      * Windows == `InitOnceExecuteOnce`
    * `sync::Barrier`
    * `sync::Barrier::new`
    * `sync::Barrier::wait` (now returns a `bool`)
    * `sync::Semaphore::new`
    * `sync::Semaphore::acquire`
    * `sync::Semaphore::release`
    
    The following items remain unstable
    
    * `sync::SemaphoreGuard`
    * `sync::Semaphore::access` - it's unclear how this relates to the poisoning
                                  story of mutexes.
    * `sync::TaskPool` - the semantics of a failing task and whether a thread is
                         re-attached to a thread pool are somewhat unclear, and the
                         utility of this type in `sync` is question with respect to
                         the jobs of other primitives. This type will likely become
                         stable or move out of the standard library over time.
    * `sync::Future` - futures as-is have yet to be deeply re-evaluated with the
                       recent core changes to Rust's synchronization story, and will
                       likely become stable in the future but are unstable until
                       that time comes.
    
    [breaking-change]
    alexcrichton committed Jan 2, 2015
    1 Configuration menu
    Copy the full SHA
    f3a7ec7 View commit details
    Browse the repository at this point in the history
  2. std: Enforce Unicode in fmt::Writer

    This commit is an implementation of [RFC 526][rfc] which is a change to alter
    the definition of the old `fmt::FormatWriter`. The new trait, renamed to
    `Writer`, now only exposes one method `write_str` in order to guarantee that all
    implementations of the formatting traits can only produce valid Unicode.
    
    [rfc]: https://github.com/rust-lang/rfcs/blob/master/text/0526-fmt-text-writer.md
    
    One of the primary improvements of this patch is the performance of the
    `.to_string()` method by avoiding an almost-always redundant UTF-8 check. This
    is a breaking change due to the renaming of the trait as well as the loss of the
    `write` method, but migration paths should be relatively easy:
    
    * All usage of `write` should move to `write_str`. If truly binary data was
      being written in an implementation of `Show`, then it will need to use a
      different trait or an altogether different code path.
    
    * All usage of `write!` should continue to work as-is with no modifications.
    
    * All usage of `Show` where implementations just delegate to another should
      continue to work as-is.
    
    [breaking-change]
    
    Closes rust-lang#20352
    alexcrichton committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    e423fcf View commit details
    Browse the repository at this point in the history
  3. std: Second pass stabilization for boxed

    This commit performs a second pass over the `std::boxed` module, taking the
    following actions:
    
    * `boxed` is now stable
    * `Box` is now stable
    * `BoxAny` is removed in favor of a direct `impl Box<Any>`
    * `Box::downcast` remains unstable while the name of the `downcast` family of
      methods is determined.
    
    This is a breaking change due to the removal of the `BoxAny` trait (note that
    the `downcast` method still exists), and existing consumers of `BoxAny` simply
    need to remove the import in their modules.
    
    [breaking-change]
    alexcrichton committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    f2ccdfd View commit details
    Browse the repository at this point in the history
  4. Fix orphan checking (cc rust-lang#19470). (This is not a complete fix…

    … of rust-lang#19470 because of the backwards compatibility feature gate.)
    
    This is a [breaking-change]. The new rules require that, for an impl of a trait defined
    in some other crate, two conditions must hold:
    
    1. Some type must be local.
    2. Every type parameter must appear "under" some local type.
    
    Here are some examples that are legal:
    
    ```rust
    struct MyStruct<T> { ... }
    
    // Here `T` appears "under' `MyStruct`.
    impl<T> Clone for MyStruct<T> { }
    
    // Here `T` appears "under' `MyStruct` as well. Note that it also appears
    // elsewhere.
    impl<T> Iterator<T> for MyStruct<T> { }
    ```
    
    Here is an illegal example:
    
    ```rust
    // Here `U` does not appear "under" `MyStruct` or any other local type.
    // We call `U` "uncovered".
    impl<T,U> Iterator<U> for MyStruct<T> { }
    ```
    
    There are a couple of ways to rewrite this last example so that it is
    legal:
    
    1. In some cases, the uncovered type parameter (here, `U`) should be converted
       into an associated type. This is however a non-local change that requires access
       to the original trait. Also, associated types are not fully baked.
    2. Add `U` as a type parameter of `MyStruct`:
       ```rust
       struct MyStruct<T,U> { ... }
       impl<T,U> Iterator<U> for MyStruct<T,U> { }
       ```
    3. Create a newtype wrapper for `U`
       ```rust
       impl<T,U> Iterator<Wrapper<U>> for MyStruct<T,U> { }
       ```
    
    Because associated types are not fully baked, which in the case of the
    `Hash` trait makes adhering to this rule impossible, you can
    temporarily disable this rule in your crate by using
    `#![feature(old_orphan_check)]`. Note that the `old_orphan_check`
    feature will be removed before 1.0 is released.
    nikomatsakis committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    c61a009 View commit details
    Browse the repository at this point in the history
  5. Disable the JSON doctests because they don't pass the new coherence

    rules and cannot be updated until the libraries are synced, nor can
    they opt in to the old semantics.
    nikomatsakis committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    5c34781 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    6ed3f24 View commit details
    Browse the repository at this point in the history
  7. Fix an infinite loop in the stability check that was the result of

    various bugs in `trait_id_of_impl`. The end result was that looking up
    the "trait_id_of_impl" with a trait's def-id yielded the same trait
    again, even though it ought to have yielded None.
    nikomatsakis committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    82a2e8e View commit details
    Browse the repository at this point in the history
  8. Accept self in place of mod in use items

    [breaking-change]
    
    `mod` is still accepted, but gives a deprecated warning
    nrc committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    74d11d2 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    f003b43 View commit details
    Browse the repository at this point in the history
  10. Accept derive instead of deriving

    [breaking-change]
    
    `deriving is still accepted, but gives a deprecation warning
    nrc committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    7506fe5 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    30e1492 View commit details
    Browse the repository at this point in the history
  12. Rebasing

    nrc committed Jan 2, 2015
    12 Configuration menu
    Copy the full SHA
    dc53461 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    f2a06f7 View commit details
    Browse the repository at this point in the history
  14. Add a pretty-print test

    sanxiyn committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    4ae7c38 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    4b40bc8 View commit details
    Browse the repository at this point in the history
  16. std: Stabilize the prelude module

    This commit is an implementation of [RFC 503][rfc] which is a stabilization
    story for the prelude. Most of the RFC was directly applied, removing reexports.
    Some reexports are kept around, however:
    
    * `range` remains until range syntax has landed to reduce churn.
    * `Path` and `GenericPath` remain until path reform lands. This is done to
      prevent many imports of `GenericPath` which will soon be removed.
    * All `io` traits remain until I/O reform lands so imports can be rewritten all
      at once to `std::io::prelude::*`.
    
    This is a breaking change because many prelude reexports have been removed, and
    the RFC can be consulted for the exact list of removed reexports, as well as to
    find the locations of where to import them.
    
    [rfc]: https://github.com/rust-lang/rfcs/blob/master/text/0503-prelude-stabilization.md
    [breaking-change]
    
    Closes rust-lang#20068
    alexcrichton committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    56290a0 View commit details
    Browse the repository at this point in the history
  17. Properly deal with Ordering in the guide

    Now that it's been removed from the prelude, we need to treat things differently.
    
    Fixes rust-lang#17967
    steveklabnik authored and alexcrichton committed Jan 2, 2015
    3 Configuration menu
    Copy the full SHA
    76e3bc2 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    5696ea5 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    1b3734f View commit details
    Browse the repository at this point in the history
  20. Fix fallout in tests.

    nikomatsakis committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    5b425c1 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    50ed6c1 View commit details
    Browse the repository at this point in the history
  22. Move the upcast routine into traits and use it for method selection…

    …; also
    
    move get_method_index into traits and give it a better name (`get_vtable_index_of_object_method`).
    nikomatsakis committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    2c1d7a7 View commit details
    Browse the repository at this point in the history
  23. Refactor object-safety into its own (cached) module so that we can

    check it more easily; also extend object safety to cover sized types
    as well as static methods.  This makes it sufficient so that we can
    always ensure that `Foo : Foo` holds for any trait `Foo`.
    nikomatsakis committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    19dcecb View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    dabd750 View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    a535f2a View commit details
    Browse the repository at this point in the history
  26. Address nits.

    nikomatsakis committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    704ed4c View commit details
    Browse the repository at this point in the history
  27. rollup merge of rust-lang#20273: alexcrichton/second-pass-comm

    Conflicts:
    	src/doc/guide.md
    	src/libcollections/bit.rs
    	src/libcollections/btree/node.rs
    	src/libcollections/slice.rs
    	src/libcore/ops.rs
    	src/libcore/prelude.rs
    	src/librand/rand_impls.rs
    	src/librustc/middle/check_match.rs
    	src/librustc/middle/infer/region_inference/mod.rs
    	src/librustc_driver/lib.rs
    	src/librustdoc/test.rs
    	src/libstd/bitflags.rs
    	src/libstd/io/comm_adapters.rs
    	src/libstd/io/mem.rs
    	src/libstd/io/mod.rs
    	src/libstd/io/net/pipe.rs
    	src/libstd/io/net/tcp.rs
    	src/libstd/io/net/udp.rs
    	src/libstd/io/pipe.rs
    	src/libstd/io/process.rs
    	src/libstd/io/stdio.rs
    	src/libstd/io/timer.rs
    	src/libstd/io/util.rs
    	src/libstd/macros.rs
    	src/libstd/os.rs
    	src/libstd/path/posix.rs
    	src/libstd/path/windows.rs
    	src/libstd/prelude/v1.rs
    	src/libstd/rand/mod.rs
    	src/libstd/rand/os.rs
    	src/libstd/sync/barrier.rs
    	src/libstd/sync/condvar.rs
    	src/libstd/sync/future.rs
    	src/libstd/sync/mpsc/mod.rs
    	src/libstd/sync/mpsc/mpsc_queue.rs
    	src/libstd/sync/mpsc/select.rs
    	src/libstd/sync/mpsc/spsc_queue.rs
    	src/libstd/sync/mutex.rs
    	src/libstd/sync/once.rs
    	src/libstd/sync/rwlock.rs
    	src/libstd/sync/semaphore.rs
    	src/libstd/sync/task_pool.rs
    	src/libstd/sys/common/helper_thread.rs
    	src/libstd/sys/unix/process.rs
    	src/libstd/sys/unix/timer.rs
    	src/libstd/sys/windows/c.rs
    	src/libstd/sys/windows/timer.rs
    	src/libstd/sys/windows/tty.rs
    	src/libstd/thread.rs
    	src/libstd/thread_local/mod.rs
    	src/libstd/thread_local/scoped.rs
    	src/libtest/lib.rs
    	src/test/auxiliary/cci_capture_clause.rs
    	src/test/bench/shootout-reverse-complement.rs
    	src/test/bench/shootout-spectralnorm.rs
    	src/test/compile-fail/array-old-syntax-2.rs
    	src/test/compile-fail/bind-by-move-no-guards.rs
    	src/test/compile-fail/builtin-superkinds-self-type.rs
    	src/test/compile-fail/comm-not-freeze-receiver.rs
    	src/test/compile-fail/comm-not-freeze.rs
    	src/test/compile-fail/issue-12041.rs
    	src/test/compile-fail/unsendable-class.rs
    	src/test/run-pass/builtin-superkinds-capabilities-transitive.rs
    	src/test/run-pass/builtin-superkinds-capabilities-xc.rs
    	src/test/run-pass/builtin-superkinds-capabilities.rs
    	src/test/run-pass/builtin-superkinds-self-type.rs
    	src/test/run-pass/capturing-logging.rs
    	src/test/run-pass/closure-bounds-can-capture-chan.rs
    	src/test/run-pass/comm.rs
    	src/test/run-pass/core-run-destroy.rs
    	src/test/run-pass/drop-trait-enum.rs
    	src/test/run-pass/hashmap-memory.rs
    	src/test/run-pass/issue-13494.rs
    	src/test/run-pass/issue-3609.rs
    	src/test/run-pass/issue-4446.rs
    	src/test/run-pass/issue-4448.rs
    	src/test/run-pass/issue-8827.rs
    	src/test/run-pass/issue-9396.rs
    	src/test/run-pass/ivec-tag.rs
    	src/test/run-pass/rust-log-filter.rs
    	src/test/run-pass/send-resource.rs
    	src/test/run-pass/send-type-inference.rs
    	src/test/run-pass/sendable-class.rs
    	src/test/run-pass/spawn-types.rs
    	src/test/run-pass/task-comm-0.rs
    	src/test/run-pass/task-comm-10.rs
    	src/test/run-pass/task-comm-11.rs
    	src/test/run-pass/task-comm-13.rs
    	src/test/run-pass/task-comm-14.rs
    	src/test/run-pass/task-comm-15.rs
    	src/test/run-pass/task-comm-16.rs
    	src/test/run-pass/task-comm-3.rs
    	src/test/run-pass/task-comm-4.rs
    	src/test/run-pass/task-comm-5.rs
    	src/test/run-pass/task-comm-6.rs
    	src/test/run-pass/task-comm-7.rs
    	src/test/run-pass/task-comm-9.rs
    	src/test/run-pass/task-comm-chan-nil.rs
    	src/test/run-pass/task-spawn-move-and-copy.rs
    	src/test/run-pass/task-stderr.rs
    	src/test/run-pass/tcp-accept-stress.rs
    	src/test/run-pass/tcp-connect-timeouts.rs
    	src/test/run-pass/tempfile.rs
    	src/test/run-pass/trait-bounds-in-arc.rs
    	src/test/run-pass/trivial-message.rs
    	src/test/run-pass/unique-send-2.rs
    	src/test/run-pass/unique-send.rs
    	src/test/run-pass/unwind-resource.rs
    alexcrichton committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    8b7d032 View commit details
    Browse the repository at this point in the history
  28. Configuration menu
    Copy the full SHA
    074996d View commit details
    Browse the repository at this point in the history
  29. Configuration menu
    Copy the full SHA
    faf5355 View commit details
    Browse the repository at this point in the history
  30. Configuration menu
    Copy the full SHA
    0101bbe View commit details
    Browse the repository at this point in the history
  31. rollup merge of rust-lang#20315: alexcrichton/std-sync

    Conflicts:
    	src/libstd/rt/exclusive.rs
    	src/libstd/sync/barrier.rs
    	src/libstd/sys/unix/pipe.rs
    	src/test/bench/shootout-binarytrees.rs
    	src/test/bench/shootout-fannkuch-redux.rs
    alexcrichton committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    009ec5d View commit details
    Browse the repository at this point in the history
  32. rollup merge of rust-lang#20354: alexcrichton/second-pass-thread_local

    Conflicts:
    	src/libstd/sys/common/thread_info.rs
    alexcrichton committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    4b0e084 View commit details
    Browse the repository at this point in the history
  33. rollup merge of rust-lang#19625: mrhota/guide_traits

    Nothing major. Clarification, copy-editing, typographical and grammatical consistency
    alexcrichton committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    5bd7a78 View commit details
    Browse the repository at this point in the history
  34. Configuration menu
    Copy the full SHA
    656d5bb View commit details
    Browse the repository at this point in the history
  35. Configuration menu
    Copy the full SHA
    b9a26bf View commit details
    Browse the repository at this point in the history
  36. rollup merge of rust-lang#20380: dcrewi/fix-make-install

    There seems to be a problem introduced by
    8b3c676 that causes "make install"
    to fail when the build is not configured to skip doc building.
    alexcrichton committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    3cf1992 View commit details
    Browse the repository at this point in the history
  37. Configuration menu
    Copy the full SHA
    073fd5b View commit details
    Browse the repository at this point in the history
  38. rollup merge of rust-lang#20386: frewsxcv/rm-reexports

    Part of rust-lang#19253
    
    [breaking-change]
    alexcrichton committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    9ca8076 View commit details
    Browse the repository at this point in the history
  39. Configuration menu
    Copy the full SHA
    e80b981 View commit details
    Browse the repository at this point in the history
  40. rollup merge of rust-lang#20391: daramos/utf8_lossy

    Prior to 9bae6ec from_utf8_lossy had a minor optimization in place that avoided having to loop from the beginning of the input slice.
    Recently 4908017 implemented Utf8Error::InvalidByte which makes this possible again.
    alexcrichton committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    c5b9ffd View commit details
    Browse the repository at this point in the history
  41. rollup merge of rust-lang#20392: daramos/travis

    Travis recently launched their new infrastructure on Amazon EC2 with improved resources. The only limitation is that they don't support sudo. http://blog.travis-ci.com/2014-12-17-faster-builds-with-container-based-infrastructure/
    I couldn't find anywhere where the build system uses sudo so I don't think that limitation affects rust builds.
    This change drops the current `make tidy` times [slightly](https://travis-ci.org/daramos/rust/builds)(travis-test branch).
    alexcrichton committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    3dfb29e View commit details
    Browse the repository at this point in the history
  42. Configuration menu
    Copy the full SHA
    b51ff9f View commit details
    Browse the repository at this point in the history
  43. Configuration menu
    Copy the full SHA
    4dab967 View commit details
    Browse the repository at this point in the history
  44. rollup merge of rust-lang#20416: nikomatsakis/coherence

    Conflicts:
    	src/test/run-pass/issue-15734.rs
    	src/test/run-pass/issue-3743.rs
    alexcrichton committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    735c308 View commit details
    Browse the repository at this point in the history
  45. rollup merge of rust-lang#20425: sanxiyn/opt-local-ty

    This avoids having ast::Ty nodes which have no counterpart in the source.
    alexcrichton committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    6f567e0 View commit details
    Browse the repository at this point in the history
  46. Merge remote-tracking branch 'origin/master' into rollup

    Conflicts:
    	src/test/compile-fail/borrowck-loan-rcvr-overloaded-op.rs
    alexcrichton committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    1f2ead1 View commit details
    Browse the repository at this point in the history
  47. 4 Configuration menu
    Copy the full SHA
    e921e3f View commit details
    Browse the repository at this point in the history
  48. rollup merge of rust-lang#20341: nikomatsakis/impl-trait-for-trait-2

    Conflicts:
    	src/librustc/middle/traits/mod.rs
    	src/libstd/io/mod.rs
    	src/test/run-pass/builtin-superkinds-self-type.rs
    alexcrichton committed Jan 2, 2015
    4 Configuration menu
    Copy the full SHA
    4459b1d View commit details
    Browse the repository at this point in the history
  49. Rebase test fixes v2

    alexcrichton committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    8cf9929 View commit details
    Browse the repository at this point in the history
  50. rollup merge of rust-lang#20410: japaric/assoc-types

    Conflicts:
    	src/liballoc/lib.rs
    	src/libcollections/lib.rs
    	src/libcollections/slice.rs
    	src/libcore/ops.rs
    	src/libcore/prelude.rs
    	src/libcore/ptr.rs
    	src/librustc/middle/traits/project.rs
    	src/libstd/c_str.rs
    	src/libstd/io/mem.rs
    	src/libstd/io/mod.rs
    	src/libstd/lib.rs
    	src/libstd/path/posix.rs
    	src/libstd/path/windows.rs
    	src/libstd/prelude.rs
    	src/libstd/rt/exclusive.rs
    	src/libsyntax/lib.rs
    	src/test/compile-fail/issue-18566.rs
    	src/test/run-pass/deref-mut-on-ref.rs
    	src/test/run-pass/deref-on-ref.rs
    	src/test/run-pass/dst-deref-mut.rs
    	src/test/run-pass/dst-deref.rs
    	src/test/run-pass/fixup-deref-mut.rs
    	src/test/run-pass/issue-13264.rs
    	src/test/run-pass/overloaded-autoderef-indexing.rs
    alexcrichton committed Jan 2, 2015
    7 Configuration menu
    Copy the full SHA
    340f3fd View commit details
    Browse the repository at this point in the history