Skip to content

Commit b398e1b

Browse files
committed
---
yaml --- r: 227819 b: refs/heads/try c: 23958d8 h: refs/heads/master i: 227817: 2055c77 227815: 1c0ddf9 v: v3
1 parent 33eaad5 commit b398e1b

File tree

4 files changed

+42
-2
lines changed

4 files changed

+42
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: aca2057ed5fb7af3f8905b2bc01f72fa001c35c8
33
refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
4-
refs/heads/try: 9b30eabc22dd3a4b878109b1da08b5ab4e228a40
4+
refs/heads/try: 23958d803e18de20564c198e1d1ec8d030d617ce
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/configure

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -899,6 +899,18 @@ then
899899
fi
900900
fi
901901

902+
# If the clang isn't already enabled, check for GCC, and if it is missing, turn
903+
# on clang as a backup.
904+
if [ -z "$CFG_ENABLE_CLANG" ]
905+
then
906+
CFG_GCC_VERSION=$("$CFG_GCC" --version 2>&1)
907+
if [ $? -ne 0 ]
908+
then
909+
step_msg "GCC not installed, will try using Clang"
910+
CFG_ENABLE_CLANG=1
911+
fi
912+
fi
913+
902914
# Okay, at this point, we have made up our minds about whether we are
903915
# going to force CFG_ENABLE_CLANG or not; save the setting if so.
904916
if [ ! -z "$CFG_ENABLE_CLANG" ]

branches/try/src/libcollectionstest/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// except according to those terms.
1010

1111
#![feature(append)]
12-
#![feature(bit_vec_append_split_off)]
1312
#![feature(bitset)]
1413
#![feature(bitvec)]
1514
#![feature(box_syntax)]
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
trait Foo {
12+
fn foo<T>(&self, val: T);
13+
}
14+
15+
trait Bar: Foo { }
16+
17+
pub struct Thing;
18+
19+
impl Foo for Thing {
20+
fn foo<T>(&self, val: T) { }
21+
}
22+
23+
impl Bar for Thing { }
24+
25+
fn main() {
26+
let mut thing = Thing;
27+
let test: &mut Bar = &mut thing;
28+
//~^ ERROR cannot convert to a trait object because trait `Bar` is not object-safe
29+
}

0 commit comments

Comments
 (0)