about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-03-23 15:10:30 -0700
committerAlex Crichton <alex@alexcrichton.com>2015-03-23 15:10:30 -0700
commitbed77408df6b279d1d3b67c07e77c8d40e496f2e (patch)
treed3ab43eb7ec3c750c241a5cd95f6b919cbe68075 /src/test
parent9e347b39f105a2ab416fc518ee51225882a6d996 (diff)
parent76ead081088d7cc88a4686210b72b60ae12bd7a8 (diff)
downloadrust-bed77408df6b279d1d3b67c07e77c8d40e496f2e.tar.gz
rust-bed77408df6b279d1d3b67c07e77c8d40e496f2e.zip
rollup merge of #23580: nikomatsakis/pattern-and-overflow
Diffstat (limited to 'src/test')
-rw-r--r--src/test/compile-fail/issue-18400.rs3
-rw-r--r--src/test/compile-fail/recursion_limit.rs9
2 files changed, 1 insertions, 11 deletions
diff --git a/src/test/compile-fail/issue-18400.rs b/src/test/compile-fail/issue-18400.rs
index 015f1fa603a..f8d85f93937 100644
--- a/src/test/compile-fail/issue-18400.rs
+++ b/src/test/compile-fail/issue-18400.rs
@@ -33,7 +33,4 @@ fn main() {
 
     0.contains(bits);
     //~^ ERROR overflow
-    //~| ERROR overflow
-    //~| ERROR overflow
-    //~| ERROR mismatched types
 }
diff --git a/src/test/compile-fail/recursion_limit.rs b/src/test/compile-fail/recursion_limit.rs
index e8bc11317f2..368269999a2 100644
--- a/src/test/compile-fail/recursion_limit.rs
+++ b/src/test/compile-fail/recursion_limit.rs
@@ -42,12 +42,5 @@ fn is_send<T:Send>() { }
 fn main() {
     is_send::<A>();
     //~^ ERROR overflow evaluating
-    //~^^ NOTE consider adding a `#![recursion_limit="20"]` attribute to your crate
-    //~^^^ NOTE required by `is_send`
-    //~^^^^ ERROR overflow evaluating
-    //~^^^^^ NOTE consider adding a `#![recursion_limit="20"]` attribute to your crate
-    //~^^^^^^ NOTE required by `is_send`
-    //~^^^^^^^ ERROR overflow evaluating
-    //~^^^^^^^^ NOTE consider adding a `#![recursion_limit="20"]` attribute to your crate
-    //~^^^^^^^^^ NOTE required by `is_send`
+    //~| NOTE consider adding a `#![recursion_limit="20"]` attribute to your crate
 }