rustc_typeck: use subtyping on the LHS of binops.
This commit is contained in:
parent
6713736275
commit
1a7fb7dc78
8 changed files with 157 additions and 75 deletions
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
enum Foo {
|
||||
A = "" + 1
|
||||
//~^ ERROR binary operation `+` cannot be applied to type `&'static str`
|
||||
//~^ ERROR binary operation `+` cannot be applied to type `&str`
|
||||
}
|
||||
|
||||
enum Bar {
|
||||
|
|
|
|||
|
|
@ -12,6 +12,8 @@
|
|||
fn foo() -> ! {
|
||||
panic!("quux");
|
||||
}
|
||||
|
||||
#[allow(resolve_trait_on_defaulted_unit)]
|
||||
fn main() {
|
||||
foo() == foo(); // these types wind up being defaulted to ()
|
||||
}
|
||||
|
|
|
|||
35
src/test/run-pass/issue-32008.rs
Normal file
35
src/test/run-pass/issue-32008.rs
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// Tests that binary operators allow subtyping on both the LHS and RHS,
|
||||
// and as such do not introduce unnecesarily strict lifetime constraints.
|
||||
|
||||
use std::ops::Add;
|
||||
|
||||
struct Foo;
|
||||
|
||||
impl<'a> Add<&'a Foo> for &'a Foo {
|
||||
type Output = ();
|
||||
fn add(self, rhs: &'a Foo) {}
|
||||
}
|
||||
|
||||
fn try_to_add(input: &Foo) {
|
||||
let local = Foo;
|
||||
|
||||
// Manual reborrow worked even with invariant trait search.
|
||||
&*input + &local;
|
||||
|
||||
// Direct use of the reference on the LHS requires additional
|
||||
// subtyping before searching (invariantly) for `LHS: Add<RHS>`.
|
||||
input + &local;
|
||||
}
|
||||
|
||||
fn main() {
|
||||
}
|
||||
20
src/test/run-pass/issue-45425.rs
Normal file
20
src/test/run-pass/issue-45425.rs
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
use std::ops::Add;
|
||||
|
||||
fn ref_add<T>(a: &T, b: &T) -> T
|
||||
where
|
||||
for<'x> &'x T: Add<&'x T, Output = T>,
|
||||
{
|
||||
a + b
|
||||
}
|
||||
|
||||
fn main() {}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
error[E0369]: binary operation `+` cannot be applied to type `&'static str`
|
||||
error[E0369]: binary operation `+` cannot be applied to type `&str`
|
||||
--> $DIR/issue-39018.rs:12:13
|
||||
|
|
||||
12 | let x = "Hello " + "World!";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue