about summary refs log tree commit diff
path: root/src/test/compile-fail
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-07-27 10:16:36 -0700
committerGitHub <noreply@github.com>2016-07-27 10:16:36 -0700
commit29abe5ec717bd58b175100cfabe833c1500c8498 (patch)
tree8bafabbbfacdaf87d7eb92fb4fa409a208ddb940 /src/test/compile-fail
parenta373b8437b205cce01a19e7cdef17a50ff7ec84a (diff)
parenta279f2f62d0b04af02f5a9e356d380f2ae6216d5 (diff)
downloadrust-29abe5ec717bd58b175100cfabe833c1500c8498.tar.gz
rust-29abe5ec717bd58b175100cfabe833c1500c8498.zip
Auto merge of #34856 - jseyfried:refactor_reset_tls, r=nrc
Avoid reseting the thread local interner at the beginning of `phase_1_parse_input`

The thread local interner is used before `phase_1_parse_input` to create `InternedString`s, which currently wrap `Rc<String>`s. Once `InternedString` is refactored to be an interned string id (like `Name`), resetting will invalidate everything that was interned before `phase_1_parse_input`.

The resets were only useful for the `rusti` project, which can now use `driver::reset_thread_local_state`.

r? @nrc
Diffstat (limited to 'src/test/compile-fail')
-rw-r--r--src/test/compile-fail/lifetime-inference-give-expl-lifetime-param.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/test/compile-fail/lifetime-inference-give-expl-lifetime-param.rs b/src/test/compile-fail/lifetime-inference-give-expl-lifetime-param.rs
index e34a3c4569d..6da87fca3f3 100644
--- a/src/test/compile-fail/lifetime-inference-give-expl-lifetime-param.rs
+++ b/src/test/compile-fail/lifetime-inference-give-expl-lifetime-param.rs
@@ -49,7 +49,8 @@ struct Baz<'x> {
 
 impl<'a> Baz<'a> {
     fn baz2<'b>(&self, x: &isize) -> (&'b isize, &'b isize) {
-        //~^ HELP consider using an explicit lifetime parameter as shown: fn baz2<'b>(&self, x: &'a isize) -> (&'a isize, &'a isize)
+        //~^ HELP consider using an explicit lifetime parameter as shown: fn baz2<'b>(&self, x: &'
+        // FIXME #35038: The above suggestion is different on Linux and Mac.
         (self.bar, x) //~ ERROR E0312
         //~^ ERROR E0312
     }