diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-03-24 14:50:46 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-03-24 14:50:46 -0700 |
| commit | a1d2e62c1f94930aaab2f9d56b3ee4f34f95369a (patch) | |
| tree | 3ed0a12ba754e76dc1af00f6a22e34a9cfd1bd88 /src/libstd/rt | |
| parent | 6da0b9dedbc975c3d9ae973216745de9dab535d2 (diff) | |
| parent | 7e3ee02006ec53ff176fc3490ba01eb2a9c823b8 (diff) | |
| download | rust-a1d2e62c1f94930aaab2f9d56b3ee4f34f95369a.tar.gz rust-a1d2e62c1f94930aaab2f9d56b3ee4f34f95369a.zip | |
rollup merge of #23630: nrc/coerce-tidy
See notes on the first commit Closes #18601 r? @nikomatsakis cc @eddyb
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/rt/mod.rs b/src/libstd/rt/mod.rs index 43aa4155629..497076cc6ac 100644 --- a/src/libstd/rt/mod.rs +++ b/src/libstd/rt/mod.rs @@ -68,7 +68,7 @@ fn lang_start(main: *const u8, argc: int, argv: *const *const u8) -> int { use thread::Thread; let something_around_the_top_of_the_stack = 1; - let addr = &something_around_the_top_of_the_stack as *const int; + let addr = &something_around_the_top_of_the_stack as *const _ as *const int; let my_stack_top = addr as uint; // FIXME #11359 we just assume that this thread has a stack of a |