Alex Crichton 64dd7be2c5 Merge remote-tracking branch 'origin/master' into rollup ...

Conflicts:
	src/liballoc/lib.rs
	src/libcore/ops.rs

2015-01-30 14:55:34 -08:00

..

driver.rs

Merge remote-tracking branch 'origin/master' into rollup

2015-01-30 14:55:34 -08:00

lib.rs

Test fixes and rebase conflicts

2015-01-30 14:53:34 -08:00

pretty.rs

std: Stabilize FromStr and parse

2015-01-30 08:52:44 -08:00

test.rs

Remove the capture mode map and just store the capture mode for individual variables.

2015-01-30 05:56:39 -05:00