about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-02-08 18:11:06 +0000
committerbors <bors@rust-lang.org>2017-02-08 18:11:06 +0000
commit4379e2fa08bf31125efa1a9d8bc3c85b16e2c2f3 (patch)
tree58de9050e9127eb919f6f11cb93bd951b457b644 /src/libcore
parent10f6a5c4431e09d355a0ba319a630e02a1e38361 (diff)
parent62d22678d4a7c6a34837137073d8767166d6db1e (diff)
downloadrust-4379e2fa08bf31125efa1a9d8bc3c85b16e2c2f3.tar.gz
rust-4379e2fa08bf31125efa1a9d8bc3c85b16e2c2f3.zip
Auto merge of #39645 - frewsxcv:rollup, r=frewsxcv
Rollup of 11 pull requests

- Successful merges: #39462, #39512, #39529, #39557, #39561, #39582, #39583, #39597, #39622, #39624, #39630
- Failed merges:
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/Cargo.toml4
-rw-r--r--src/libcore/benches/any.rs (renamed from src/libcore/bench/any.rs)0
-rw-r--r--src/libcore/benches/hash/mod.rs (renamed from src/libcore/bench/hash/mod.rs)0
-rw-r--r--src/libcore/benches/hash/sip.rs (renamed from src/libcore/bench/hash/sip.rs)0
-rw-r--r--src/libcore/benches/iter.rs (renamed from src/libcore/bench/iter.rs)0
-rw-r--r--src/libcore/benches/lib.rs (renamed from src/libcore/bench/lib.rs)0
-rw-r--r--src/libcore/benches/mem.rs (renamed from src/libcore/bench/mem.rs)0
-rw-r--r--src/libcore/benches/num/dec2flt/mod.rs (renamed from src/libcore/bench/num/dec2flt/mod.rs)0
-rw-r--r--src/libcore/benches/num/flt2dec/mod.rs (renamed from src/libcore/bench/num/flt2dec/mod.rs)0
-rw-r--r--src/libcore/benches/num/flt2dec/strategy/dragon.rs (renamed from src/libcore/bench/num/flt2dec/strategy/dragon.rs)0
-rw-r--r--src/libcore/benches/num/flt2dec/strategy/grisu.rs (renamed from src/libcore/bench/num/flt2dec/strategy/grisu.rs)0
-rw-r--r--src/libcore/benches/num/mod.rs (renamed from src/libcore/bench/num/mod.rs)0
-rw-r--r--src/libcore/benches/ops.rs (renamed from src/libcore/bench/ops.rs)0
13 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/Cargo.toml b/src/libcore/Cargo.toml
index 4f7cd7b016d..e847c7fa3a0 100644
--- a/src/libcore/Cargo.toml
+++ b/src/libcore/Cargo.toml
@@ -14,5 +14,5 @@ name = "coretest"
 path = "../libcoretest/lib.rs"
 
 [[bench]]
-name = "corebench"
-path = "../libcore/bench/lib.rs"
+name = "corebenches"
+path = "../libcore/benches/lib.rs"
diff --git a/src/libcore/bench/any.rs b/src/libcore/benches/any.rs
index 67e02cf9509..67e02cf9509 100644
--- a/src/libcore/bench/any.rs
+++ b/src/libcore/benches/any.rs
diff --git a/src/libcore/bench/hash/mod.rs b/src/libcore/benches/hash/mod.rs
index 55d9e3e0913..55d9e3e0913 100644
--- a/src/libcore/bench/hash/mod.rs
+++ b/src/libcore/benches/hash/mod.rs
diff --git a/src/libcore/bench/hash/sip.rs b/src/libcore/benches/hash/sip.rs
index 3379c85bbec..3379c85bbec 100644
--- a/src/libcore/bench/hash/sip.rs
+++ b/src/libcore/benches/hash/sip.rs
diff --git a/src/libcore/bench/iter.rs b/src/libcore/benches/iter.rs
index 93d38a5bc83..93d38a5bc83 100644
--- a/src/libcore/bench/iter.rs
+++ b/src/libcore/benches/iter.rs
diff --git a/src/libcore/bench/lib.rs b/src/libcore/benches/lib.rs
index d2db329da79..d2db329da79 100644
--- a/src/libcore/bench/lib.rs
+++ b/src/libcore/benches/lib.rs
diff --git a/src/libcore/bench/mem.rs b/src/libcore/benches/mem.rs
index 8e541d92a7f..8e541d92a7f 100644
--- a/src/libcore/bench/mem.rs
+++ b/src/libcore/benches/mem.rs
diff --git a/src/libcore/bench/num/dec2flt/mod.rs b/src/libcore/benches/num/dec2flt/mod.rs
index 562866e1177..562866e1177 100644
--- a/src/libcore/bench/num/dec2flt/mod.rs
+++ b/src/libcore/benches/num/dec2flt/mod.rs
diff --git a/src/libcore/bench/num/flt2dec/mod.rs b/src/libcore/benches/num/flt2dec/mod.rs
index 1de2bf4921f..1de2bf4921f 100644
--- a/src/libcore/bench/num/flt2dec/mod.rs
+++ b/src/libcore/benches/num/flt2dec/mod.rs
diff --git a/src/libcore/bench/num/flt2dec/strategy/dragon.rs b/src/libcore/benches/num/flt2dec/strategy/dragon.rs
index 6824cf40ed2..6824cf40ed2 100644
--- a/src/libcore/bench/num/flt2dec/strategy/dragon.rs
+++ b/src/libcore/benches/num/flt2dec/strategy/dragon.rs
diff --git a/src/libcore/bench/num/flt2dec/strategy/grisu.rs b/src/libcore/benches/num/flt2dec/strategy/grisu.rs
index 82e1a858fca..82e1a858fca 100644
--- a/src/libcore/bench/num/flt2dec/strategy/grisu.rs
+++ b/src/libcore/benches/num/flt2dec/strategy/grisu.rs
diff --git a/src/libcore/bench/num/mod.rs b/src/libcore/benches/num/mod.rs
index 55f0bdb57ec..55f0bdb57ec 100644
--- a/src/libcore/bench/num/mod.rs
+++ b/src/libcore/benches/num/mod.rs
diff --git a/src/libcore/bench/ops.rs b/src/libcore/benches/ops.rs
index 7f36a4b0771..7f36a4b0771 100644
--- a/src/libcore/bench/ops.rs
+++ b/src/libcore/benches/ops.rs