From 2d1d3fef6205276e0123dea96cc346d1da7df6d0 Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Thu, 9 Aug 2018 06:58:28 -0400 Subject: support user annotations in fns, methods --- src/test/ui/nll/user-annotations/fns.rs | 60 ++++++++++++++++ src/test/ui/nll/user-annotations/fns.stderr | 41 +++++++++++ src/test/ui/nll/user-annotations/method-call.rs | 81 ++++++++++++++++++++++ .../ui/nll/user-annotations/method-call.stderr | 41 +++++++++++ 4 files changed, 223 insertions(+) create mode 100644 src/test/ui/nll/user-annotations/fns.rs create mode 100644 src/test/ui/nll/user-annotations/fns.stderr create mode 100644 src/test/ui/nll/user-annotations/method-call.rs create mode 100644 src/test/ui/nll/user-annotations/method-call.stderr (limited to 'src/test') diff --git a/src/test/ui/nll/user-annotations/fns.rs b/src/test/ui/nll/user-annotations/fns.rs new file mode 100644 index 00000000000..4f26d5422b0 --- /dev/null +++ b/src/test/ui/nll/user-annotations/fns.rs @@ -0,0 +1,60 @@ +// 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 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// Unit test for the "user substitutions" that are annotated on each +// node. + +#![feature(nll)] + +fn some_fn(arg: T) { } + +fn no_annot() { + let c = 66; + some_fn(&c); // OK +} + +fn annot_underscore() { + let c = 66; + some_fn::<_>(&c); // OK +} + +fn annot_reference_any_lifetime() { + let c = 66; + some_fn::<&u32>(&c); // OK +} + +fn annot_reference_static_lifetime() { + let c = 66; + some_fn::<&'static u32>(&c); //~ ERROR +} + +fn annot_reference_named_lifetime<'a>(_d: &'a u32) { + let c = 66; + some_fn::<&'a u32>(&c); //~ ERROR +} + +fn annot_reference_named_lifetime_ok<'a>(c: &'a u32) { + some_fn::<&'a u32>(c); +} + +fn annot_reference_named_lifetime_in_closure<'a>(_: &'a u32) { + let _closure = || { + let c = 66; + some_fn::<&'a u32>(&c); //~ ERROR + }; +} + +fn annot_reference_named_lifetime_in_closure_ok<'a>(c: &'a u32) { + let _closure = || { + some_fn::<&'a u32>(c); + }; +} + +fn main() { } diff --git a/src/test/ui/nll/user-annotations/fns.stderr b/src/test/ui/nll/user-annotations/fns.stderr new file mode 100644 index 00000000000..b6ef336567c --- /dev/null +++ b/src/test/ui/nll/user-annotations/fns.stderr @@ -0,0 +1,41 @@ +error[E0597]: `c` does not live long enough + --> $DIR/fns.rs:35:29 + | +LL | some_fn::<&'static u32>(&c); //~ ERROR + | ^^ borrowed value does not live long enough +LL | } + | - `c` dropped here while still borrowed + | + = note: borrowed value must be valid for the static lifetime... + +error[E0597]: `c` does not live long enough + --> $DIR/fns.rs:40:24 + | +LL | some_fn::<&'a u32>(&c); //~ ERROR + | ^^ borrowed value does not live long enough +LL | } + | - `c` dropped here while still borrowed + | +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 38:35... + --> $DIR/fns.rs:38:35 + | +LL | fn annot_reference_named_lifetime<'a>(_d: &'a u32) { + | ^^ + +error[E0597]: `c` does not live long enough + --> $DIR/fns.rs:50:28 + | +LL | some_fn::<&'a u32>(&c); //~ ERROR + | ^^ borrowed value does not live long enough +LL | }; + | - `c` dropped here while still borrowed + | +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 47:46... + --> $DIR/fns.rs:47:46 + | +LL | fn annot_reference_named_lifetime_in_closure<'a>(_: &'a u32) { + | ^^ + +error: aborting due to 3 previous errors + +For more information about this error, try `rustc --explain E0597`. diff --git a/src/test/ui/nll/user-annotations/method-call.rs b/src/test/ui/nll/user-annotations/method-call.rs new file mode 100644 index 00000000000..9a03679bef0 --- /dev/null +++ b/src/test/ui/nll/user-annotations/method-call.rs @@ -0,0 +1,81 @@ +// 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 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// Unit test for the "user substitutions" that are annotated on each +// node. + +#![feature(nll)] + +trait Bazoom { + fn method(&self, arg: T, arg2: U) { } +} + +impl Bazoom for T { +} + +fn no_annot() { + let a = 22; + let b = 44; + let c = 66; + a.method(b, &c); // OK +} + +fn annot_underscore() { + let a = 22; + let b = 44; + let c = 66; + a.method::<_>(b, &c); // OK +} + +fn annot_reference_any_lifetime() { + let a = 22; + let b = 44; + let c = 66; + a.method::<&u32>(b, &c); // OK +} + +fn annot_reference_static_lifetime() { + let a = 22; + let b = 44; + let c = 66; + a.method::<&'static u32>(b, &c); //~ ERROR +} + +fn annot_reference_named_lifetime<'a>(_d: &'a u32) { + let a = 22; + let b = 44; + let c = 66; + a.method::<&'a u32>(b, &c); //~ ERROR +} + +fn annot_reference_named_lifetime_ok<'a>(c: &'a u32) { + let a = 22; + let b = 44; + a.method::<&'a u32>(b, c); +} + +fn annot_reference_named_lifetime_in_closure<'a>(_: &'a u32) { + let a = 22; + let b = 44; + let _closure = || { + let c = 66; + a.method::<&'a u32>(b, &c); //~ ERROR + }; +} + +fn annot_reference_named_lifetime_in_closure_ok<'a>(c: &'a u32) { + let a = 22; + let b = 44; + let _closure = || { + a.method::<&'a u32>(b, c); + }; +} + +fn main() { } diff --git a/src/test/ui/nll/user-annotations/method-call.stderr b/src/test/ui/nll/user-annotations/method-call.stderr new file mode 100644 index 00000000000..f1c7ff1e0fb --- /dev/null +++ b/src/test/ui/nll/user-annotations/method-call.stderr @@ -0,0 +1,41 @@ +error[E0597]: `c` does not live long enough + --> $DIR/method-call.rs:48:34 + | +LL | a.method::<&'static u32>(b, &c); //~ ERROR + | ^^ borrowed value does not live long enough +LL | } + | - `c` dropped here while still borrowed + | + = note: borrowed value must be valid for the static lifetime... + +error[E0597]: `c` does not live long enough + --> $DIR/method-call.rs:55:29 + | +LL | a.method::<&'a u32>(b, &c); //~ ERROR + | ^^ borrowed value does not live long enough +LL | } + | - `c` dropped here while still borrowed + | +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 51:35... + --> $DIR/method-call.rs:51:35 + | +LL | fn annot_reference_named_lifetime<'a>(_d: &'a u32) { + | ^^ + +error[E0597]: `c` does not live long enough + --> $DIR/method-call.rs:69:33 + | +LL | a.method::<&'a u32>(b, &c); //~ ERROR + | ^^ borrowed value does not live long enough +LL | }; + | - `c` dropped here while still borrowed + | +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 64:46... + --> $DIR/method-call.rs:64:46 + | +LL | fn annot_reference_named_lifetime_in_closure<'a>(_: &'a u32) { + | ^^ + +error: aborting due to 3 previous errors + +For more information about this error, try `rustc --explain E0597`. -- cgit 1.4.1-3-g733a5