Skip to content

Commit ad1eabf

Browse files
committed
---
yaml --- r: 277651 b: refs/heads/try c: 238e4ee h: refs/heads/master i: 277649: a85fa73 277647: a92e6aa
1 parent 5ab24c6 commit ad1eabf

File tree

5 files changed

+14
-7
lines changed

5 files changed

+14
-7
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: 6dbb0e86aec11050480beb76eade6fb805010ba7
33
refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
4-
refs/heads/try: 6c883840e68860b834fecfa6df337241af3c2a67
4+
refs/heads/try: 238e4ee104179c5a6beb5bb25ffe28a3fd77bff5
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/librustc_lint/lib.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,11 @@ pub fn register_builtins(store: &mut lint::LintStore, sess: Option<&Session>) {
192192
},
193193
FutureIncompatibleInfo {
194194
id: LintId::of(UNSIZED_IN_TUPLE),
195-
reference: "RFC PR 1592 <https://github.com/rust-lang/rfcs/pull/1592>",
195+
reference: "issue #33242 <https://github.com/rust-lang/rust/issues/33242>",
196+
},
197+
FutureIncompatibleInfo {
198+
id: LintId::of(OBJECT_UNSAFE_FRAGMENT),
199+
reference: "issue #33243 <https://github.com/rust-lang/rust/issues/33243>",
196200
}
197201
]);
198202

branches/try/src/librustdoc/clean/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -865,6 +865,7 @@ impl<'a> Clean<WherePredicate> for ty::Predicate<'a> {
865865
Predicate::WellFormed(_) => panic!("not user writable"),
866866
Predicate::ObjectSafe(_) => panic!("not user writable"),
867867
Predicate::ClosureKind(..) => panic!("not user writable"),
868+
Predicate::Rfc1592(..) => panic!("not user writable"),
868869
}
869870
}
870871
}

branches/try/src/test/compile-fail/issue-20692.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ fn f<T: Array>(x: &T) {
1414
let _ = x
1515
//~^ ERROR `Array` cannot be made into an object
1616
//~| NOTE the trait cannot require that `Self : Sized`
17+
//~| NOTE requirements on the impl of `std::ops::CoerceUnsized<&Array>`
1718
as
1819
&Array;
1920
//~^ ERROR `Array` cannot be made into an object

branches/try/src/test/compile-fail/rfc1592-deprecated.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,23 @@
1010

1111
use std::fmt;
1212

13-
trait Foo {
14-
fn foo(&self) -> (Self, Self);
15-
//~^ WARNING hard error
16-
}
13+
#[deny(warnings)] trait Foo { fn foo(&self) -> (Self, Self); }
14+
//~^ ERROR the trait bound `Self: std::marker::Sized` is not satisfied
15+
//~| WARNING hard error
1716

1817
impl<T: Copy> Foo for T {
1918
fn foo(&self) -> (Self, Self) {
2019
(*self, *self)
2120
}
2221
}
2322

23+
#[deny(warnings)]
2424
fn main() {
2525
assert_eq!((11).foo(), (11, 11));
2626

2727
let junk: Box<fmt::Debug+Sized> = Box::new(42);
28-
//~^ WARNING hard error
28+
//~^ ERROR the trait cannot require that `Self : Sized`
29+
//~| WARNING hard error
2930
let f = format!("{:?}", junk);
3031
assert_eq!(f, "42");
3132
}

0 commit comments

Comments
 (0)