From d5f443d81de64a6b551ce2f09fb129b03941b05c Mon Sep 17 00:00:00 2001 From: Pramod Bisht Date: Thu, 5 Jul 2018 23:42:03 +0530 Subject: [PATCH 1/2] Addresses #52049 --- src/librustc_borrowck/borrowck/mod.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/librustc_borrowck/borrowck/mod.rs b/src/librustc_borrowck/borrowck/mod.rs index 4bd8e6afa76..530f266aa1f 100644 --- a/src/librustc_borrowck/borrowck/mod.rs +++ b/src/librustc_borrowck/borrowck/mod.rs @@ -1009,7 +1009,10 @@ impl<'a, 'tcx> BorrowckCtxt<'a, 'tcx> { let node_id = scope.node_id(self.tcx, &self.region_scope_tree); match self.tcx.hir.find(node_id) { Some(hir_map::NodeStmt(_)) => { - db.note("consider using a `let` binding to increase its lifetime"); + if *sub_scope != ty::ReStatic { + db.note("consider using a `let` binding to increase its lifetime"); + } + } _ => {} } From ab767eecb00847df456fa519a07b9ee96d786000 Mon Sep 17 00:00:00 2001 From: Pramod Bisht Date: Sat, 7 Jul 2018 15:51:50 +0530 Subject: [PATCH 2/2] Added UI testcases for #52049 --- src/test/ui/suggestions/issue-52049.nll.stderr | 13 +++++++++++++ src/test/ui/suggestions/issue-52049.rs | 18 ++++++++++++++++++ src/test/ui/suggestions/issue-52049.stderr | 13 +++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 src/test/ui/suggestions/issue-52049.nll.stderr create mode 100644 src/test/ui/suggestions/issue-52049.rs create mode 100644 src/test/ui/suggestions/issue-52049.stderr diff --git a/src/test/ui/suggestions/issue-52049.nll.stderr b/src/test/ui/suggestions/issue-52049.nll.stderr new file mode 100644 index 00000000000..6f71f167611 --- /dev/null +++ b/src/test/ui/suggestions/issue-52049.nll.stderr @@ -0,0 +1,13 @@ +error[E0597]: borrowed value does not live long enough + --> $DIR/issue-52049.rs:16:10 + | +LL | foo(&unpromotable(5u32)); + | ^^^^^^^^^^^^^^^^^^ temporary value does not live long enough +LL | } + | - temporary value only lives until here + | + = note: borrowed value must be valid for the static lifetime... + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0597`. diff --git a/src/test/ui/suggestions/issue-52049.rs b/src/test/ui/suggestions/issue-52049.rs new file mode 100644 index 00000000000..daff2258d36 --- /dev/null +++ b/src/test/ui/suggestions/issue-52049.rs @@ -0,0 +1,18 @@ +// Copyright 2018 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. + +fn foo(_: &'static u32) {} + +fn unpromotable(t: T) -> T { t } + +fn main() { + foo(&unpromotable(5u32)); +} +//~^^ ERROR borrowed value does not live long enough diff --git a/src/test/ui/suggestions/issue-52049.stderr b/src/test/ui/suggestions/issue-52049.stderr new file mode 100644 index 00000000000..e1e501023fc --- /dev/null +++ b/src/test/ui/suggestions/issue-52049.stderr @@ -0,0 +1,13 @@ +error[E0597]: borrowed value does not live long enough + --> $DIR/issue-52049.rs:16:10 + | +LL | foo(&unpromotable(5u32)); + | ^^^^^^^^^^^^^^^^^^ - temporary value only lives until here + | | + | temporary value does not live long enough + | + = note: borrowed value must be valid for the static lifetime... + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0597`.