about summary refs log tree commit diff
path: root/src/test/parse-fail
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2015-02-24 07:14:34 +0530
committerManish Goregaokar <manishsmail@gmail.com>2015-02-24 12:08:33 +0530
commiteaacc7aad5817ca10277ea6658d6e23b88d4cf77 (patch)
treeb66e147432136157f275f502db8fad393211e3e1 /src/test/parse-fail
parentc89a30f2ab9342d4b2dc7a0878c40a1dd318af23 (diff)
parente3104d8f0c3ceb3b268cd6ddc5e91f355e44a7c5 (diff)
downloadrust-eaacc7aad5817ca10277ea6658d6e23b88d4cf77.tar.gz
rust-eaacc7aad5817ca10277ea6658d6e23b88d4cf77.zip
Rollup merge of #22632 - nagisa:kill-show-string-with-fire!, r=alexcrichton
 Toss the tomatoes!

r? @aturon

Fixes #22478. The underlying bug(?) behind that issue still exists though and there’s another issue that reports it.
Diffstat (limited to 'src/test/parse-fail')
-rw-r--r--src/test/parse-fail/trailing-plus-in-bounds.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/test/parse-fail/trailing-plus-in-bounds.rs b/src/test/parse-fail/trailing-plus-in-bounds.rs
index e8f9ed4d2cf..8febbf8309e 100644
--- a/src/test/parse-fail/trailing-plus-in-bounds.rs
+++ b/src/test/parse-fail/trailing-plus-in-bounds.rs
@@ -8,11 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::fmt::Show;
+use std::fmt::Debug;
 
 fn main() {
-    let x: Box<Show+> = box 3 as Box<Show+>;
+    let x: Box<Debug+> = box 3 as Box<Debug+>;
     //~^ ERROR at least one type parameter bound must be specified
     //~^^ ERROR at least one type parameter bound must be specified
 }
-