git.lizzy.rs Git - rust.git/commit

]> git.lizzy.rs Git - rust.git/commit

author	Brian Anderson <banderson@mozilla.com>
	Mon, 4 Feb 2013 19:07:36 +0000 (11:07 -0800)
committer	Brian Anderson <banderson@mozilla.com>
	Mon, 4 Feb 2013 19:58:30 +0000 (11:58 -0800)
commit	e08a805b306398b316a489f76960569ac19b25b2
tree	2099ffddadee1671642155cf2086fca581f5cfbc	tree \| snapshot
parent	27e1ac5bb93626da70135e167a6596d854e7e679	commit \| diff
parent	aa9c28ef47d8b6a57e91b5468d70900d8e4172de	commit \| diff

Merge remote-tracking branch 'bstrie/rimov' into incoming

Conflicts:
src/libsyntax/parse/parser.rs
src/test/bench/graph500-bfs.rs
src/test/bench/sudoku.rs
src/test/run-pass/borrowck-mut-vec-as-imm-slice.rs
src/test/run-pass/empty-mutable-vec.rs
src/test/run-pass/foreach-nested.rs
src/test/run-pass/swap-2.rs

33 files changed:

doc/rust.md	diff1 \|	diff2 \|	blob \| history
doc/tutorial.md	diff1 \|	diff2 \|	blob \| history
src/libfuzzer/rand_util.rs	diff1 \|	diff2 \|	blob \| history
src/librustdoc/markdown_writer.rs	diff1 \|	diff2 \|	blob \| history
src/libstd/bitv.rs	diff1 \|	diff2 \|	blob \| history
src/libstd/net_tcp.rs	diff1 \|	diff2 \|	blob \| history
src/libstd/oldmap.rs	diff1 \|	\|	blob \| history
src/libstd/rope.rs	diff1 \|	diff2 \|	blob \| history
src/libstd/sort.rs	diff1 \|	diff2 \|	blob \| history
src/libstd/sync.rs	diff1 \|	diff2 \|	blob \| history
src/libsyntax/attr.rs	diff1 \|	diff2 \|	blob \| history
src/libsyntax/parse/parser.rs	diff1 \|	diff2 \|	blob \| history
src/libsyntax/print/pp.rs	diff1 \|	diff2 \|	blob \| history
src/test/bench/graph500-bfs.rs	diff1 \|	diff2 \|	blob \| history
src/test/bench/sudoku.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/borrowck-mut-vec-as-imm-slice.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/coerce-reborrow-imm-vec-arg.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/coerce-reborrow-imm-vec-rcvr.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/coerce-reborrow-mut-vec-arg.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/coerce-reborrow-mut-vec-rcvr.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/empty-mutable-vec.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/explicit-self-objects-ext-1.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/explicit-self-objects-ext-2.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/explicit-self-objects-ext-3.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/explicit-self-objects-ext-4.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/foreach-nested.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/impl-variance.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/issue-3563-3.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/log-linearized.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/maybe-mutable.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/mutable-vec-drop.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/rcvr-borrowed-to-slice.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/swap-2.rs	diff1 \|	diff2 \|	blob \| history

Empowering everyone to build reliable and efficient software.

RSS Atom

doc/rust.md	diff1 \|	diff2 \|	blob \| history
doc/tutorial.md	diff1 \|	diff2 \|	blob \| history
src/libfuzzer/rand_util.rs	diff1 \|	diff2 \|	blob \| history
src/librustdoc/markdown_writer.rs	diff1 \|	diff2 \|	blob \| history
src/libstd/bitv.rs	diff1 \|	diff2 \|	blob \| history
src/libstd/net_tcp.rs	diff1 \|	diff2 \|	blob \| history
src/libstd/oldmap.rs	diff1 \|	\|	blob \| history
src/libstd/rope.rs	diff1 \|	diff2 \|	blob \| history
src/libstd/sort.rs	diff1 \|	diff2 \|	blob \| history
src/libstd/sync.rs	diff1 \|	diff2 \|	blob \| history
src/libsyntax/attr.rs	diff1 \|	diff2 \|	blob \| history
src/libsyntax/parse/parser.rs	diff1 \|	diff2 \|	blob \| history
src/libsyntax/print/pp.rs	diff1 \|	diff2 \|	blob \| history
src/test/bench/graph500-bfs.rs	diff1 \|	diff2 \|	blob \| history
src/test/bench/sudoku.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/borrowck-mut-vec-as-imm-slice.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/coerce-reborrow-imm-vec-arg.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/coerce-reborrow-imm-vec-rcvr.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/coerce-reborrow-mut-vec-arg.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/coerce-reborrow-mut-vec-rcvr.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/empty-mutable-vec.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/explicit-self-objects-ext-1.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/explicit-self-objects-ext-2.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/explicit-self-objects-ext-3.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/explicit-self-objects-ext-4.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/foreach-nested.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/impl-variance.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/issue-3563-3.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/log-linearized.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/maybe-mutable.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/mutable-vec-drop.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/rcvr-borrowed-to-slice.rs	diff1 \|	diff2 \|	blob \| history
src/test/run-pass/swap-2.rs	diff1 \|	diff2 \|	blob \| history