https://github.com/rust-lang/rust http://git.dreamy.place/mirrors/rust/atom?h=0.3 2012-07-02T22:23:41+00:00 2012-07-02T22:23:41+00:00 Brian Anderson banderson@mozilla.com 2012-07-02T21:44:31+00:00 urn:sha1:569467eb0d110dd299cb2efcce13e998d1d9c11f Conflicts: src/compiletest/errors.rs src/libsyntax/parse/attr.rs src/libsyntax/parse/comments.rs src/test/compile-fail/ambig_impl_unify.rs src/test/compile-fail/assign-super.rs src/test/compile-fail/bad-for-loop.rs src/test/compile-fail/bad-var-env-capture-in-block-arg.rs src/test/compile-fail/block-arg-as-stmt-with-value.rs src/test/compile-fail/borrowck-assign-comp-idx.rs src/test/compile-fail/borrowck-lend-flow.rs src/test/compile-fail/borrowck-loan-blocks-move-cc.rs src/test/compile-fail/borrowck-loan-blocks-mut-uniq.rs src/test/compile-fail/borrowck-loan-rcvr.rs src/test/compile-fail/borrowck-loan-vec-content.rs src/test/compile-fail/borrowck-mut-vec-as-imm-slice-bad.rs src/test/compile-fail/cap-clause-with-stack-closure.rs src/test/compile-fail/do1.rs src/test/compile-fail/do2.rs src/test/compile-fail/empty-vec-trailing-comma.rs src/test/compile-fail/evec-subtyping.rs src/test/compile-fail/issue-1896.rs src/test/compile-fail/issue-2149.rs src/test/compile-fail/issue-2150.rs src/test/compile-fail/issue-2487-b.rs src/test/compile-fail/kindck-implicit-close-over-mut-var.rs src/test/compile-fail/liveness-issue-2163.rs src/test/compile-fail/liveness-use-in-index-lvalue.rs src/test/compile-fail/no-reuse-move-arc.rs src/test/compile-fail/no-send-res-ports.rs src/test/compile-fail/non-const.rs src/test/compile-fail/pure-higher-order.rs src/test/compile-fail/pure-loop-body.rs src/test/compile-fail/regions-addr-of-upvar-self.rs src/test/compile-fail/regions-escape-loop-via-vec.rs src/test/compile-fail/regions-scoping.rs src/test/compile-fail/seq-args.rs src/test/compile-fail/tstate-unsat-in-called-fn-expr.rs src/test/compile-fail/tstate-unsat-in-fn-expr.rs src/test/compile-fail/vec-add.rs src/test/compile-fail/vec-concat-bug.rs src/test/compile-fail/vector-no-ann.rs 2012-06-30T11:23:59+00:00 Gareth Daniel Smith garethdanielsmith@gmail.com 2012-06-30T11:23:59+00:00 urn:sha1:6d86969260b73432c96b9a63a5a68559e56aabcd conflict with the new single-line-sugared-inner-doc-comment (`//! ...`). 2012-06-30T00:41:45+00:00 Michael Sullivan sully@msully.net 2012-06-29T23:26:56+00:00 urn:sha1:98e161f00e8850b0f5c6a3a9f1b22b222c2355b7 2012-04-15T01:48:58+00:00 Niko Matsakis niko@alum.mit.edu 2012-04-15T01:45:03+00:00 urn:sha1:cc16165e40ec730dd9b0e01f19e8056244ac3a57