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

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

author	Patrick Walton <pcwalton@mimiga.net>
	Sun, 24 Nov 2013 19:44:28 +0000 (11:44 -0800)
committer	Patrick Walton <pcwalton@mimiga.net>
	Tue, 26 Nov 2013 19:04:39 +0000 (11:04 -0800)
commit	9521551b4710805674ad6c1755bef4e76784db02
tree	26dc6ae8869940156bb98878eb5d1787d4b8f251	tree \| snapshot
parent	151b7ed52d76a11a39888931056f1bcc9c45807a	commit \| diff

librustc: Fix merge fallout.

24 files changed:

src/libextra/json.rs		diff \| blob \| history
src/libextra/sync.rs		diff \| blob \| history
src/libextra/time.rs		diff \| blob \| history
src/librustc/middle/lint.rs		diff \| blob \| history
src/librustc/middle/privacy.rs		diff \| blob \| history
src/librustpkg/testsuite/pass/src/c-dependencies/pkg.rs		diff \| blob \| history
src/librustuv/net.rs		diff \| blob \| history
src/libstd/rc.rs		diff \| blob \| history
src/libstd/rt/args.rs		diff \| blob \| history
src/libstd/rt/comm.rs		diff \| blob \| history
src/libstd/select.rs		diff \| blob \| history
src/libstd/unstable/sync.rs		diff \| blob \| history
src/libstd/vec.rs		diff \| blob \| history
src/test/bench/core-set.rs		diff \| blob \| history
src/test/bench/shootout-pfib.rs		diff \| blob \| history
src/test/bench/task-perf-spawnalot.rs		diff \| blob \| history
src/test/debug-info/lexical-scope-in-unique-closure.rs		diff \| blob \| history
src/test/debug-info/var-captured-in-sendable-closure.rs		diff \| blob \| history
src/test/pretty/disamb-stmt-expr.rs		diff \| blob \| history
src/test/pretty/do1.rs		diff \| blob \| history
src/test/run-pass/borrowck-preserve-box-in-field.rs		diff \| blob \| history
src/test/run-pass/borrowck-preserve-box-in-uniq.rs		diff \| blob \| history
src/test/run-pass/borrowck-preserve-box.rs		diff \| blob \| history
src/test/run-pass/borrowck-preserve-expl-deref.rs		diff \| blob \| history

Empowering everyone to build reliable and efficient software.