Skip to content

Commit

Permalink
A test file is fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
sonwow committed May 10, 2013
1 parent c8e93ed commit 4400bbd
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/test/compile-fail/core-tls-store-pointer.rs
Expand Up @@ -10,12 +10,12 @@

// Testing that we can't store a borrowed pointer it task-local storage

use core::task::local_data::*;
use core::local_data::*;

fn key(_x: @&int) { }

fn main() {
unsafe {
local_data_set(key, @&0); //~ ERROR does not fulfill `'static`
}
}
}

5 comments on commit 4400bbd

@bors
Copy link
Contributor

@bors bors commented on 4400bbd May 10, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from ILyoan
at sonwow@4400bbd

@bors
Copy link
Contributor

@bors bors commented on 4400bbd May 10, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging sonwow/rust/issue-6306 = 4400bbd into auto

@bors
Copy link
Contributor

@bors bors commented on 4400bbd May 10, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sonwow/rust/issue-6306 = 4400bbd merged ok, testing candidate = 6da2c98

@bors
Copy link
Contributor

@bors bors commented on 4400bbd May 10, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 4400bbd May 10, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding incoming to auto = 6da2c98

Please sign in to comment.