Replace int/uint by isize/usize in libstd/thread.rs #22510

GuillaumeGomez · 2015-02-18T23:26:07Z

Part of #22240.

rust-highfive · 2015-02-18T23:26:13Z

(rust_highfive has picked a reviewer for you, use r? to override)

aturon · 2015-02-18T23:41:34Z

src/libstd/thread.rs

@@ -805,13 +805,13 @@ mod test {
    }

    fn avoid_copying_the_body<F>(spawnfn: F) where F: FnOnce(Thunk<'static>) {
-        let (tx, rx) = channel::<uint>();
+        let (tx, rx) = channel::<usize>();


This can just as well be u32

alexcrichton · 2015-02-24T01:01:01Z

Thanks! r=me with a squash

Also feel free to comment on a PR whenever you update it because sadly github does not send out notifications otherwise.

GuillaumeGomez · 2015-02-26T16:46:17Z

@alexcrichton: I think it can be merged now. Except if @aturon sees something else which needs to be changed ?

alexcrichton · 2015-02-27T02:12:57Z

Could you squash the commits together as well?

GuillaumeGomez · 2015-02-27T14:42:36Z

Done !

alexcrichton · 2015-02-27T17:58:00Z

@bors: r+ d708089

bors · 2015-02-27T18:17:06Z

⌛ Testing commit d708089 with merge 54449c5...

bors · 2015-02-27T18:53:18Z

💔 Test failed - auto-linux-64-x-android-t

alexcrichton · 2015-02-27T18:59:13Z

@bors: retry

bors · 2015-02-27T21:07:25Z

⚡ Previous build results are reusable. Rebuilding only auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-x-android-t, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-win-32-nopt-t, auto-win-32-opt, auto-win-64-nopt-t, auto-win-64-opt...

bors · 2015-02-27T21:10:28Z

💔 Test failed - auto-win-32-nopt-t

alexcrichton · 2015-02-27T21:24:13Z

@bors: retry clean

alexcrichton · 2015-02-28T02:33:53Z

@bors: rollup

Manishearth · 2015-02-28T11:49:39Z

I'm getting these errors in libstd:

/home/manishearth/Mozilla/rust/src/libstd/panicking.rs:36:61: 36:65 warning: the `uint` type is deprecated; use `usize` or a fixed-sized integer
/home/manishearth/Mozilla/rust/src/libstd/panicking.rs:36 pub fn on_panic(obj: &(Any+Send), file: &'static str, line: uint) {
                                                                                                                      ^~~~
/home/manishearth/Mozilla/rust/src/libstd/panicking.rs:36:65: 36:65 help: add #![feature(int_uint)] to the crate attributes to silence this warning
/home/manishearth/Mozilla/rust/src/libgetopts/lib.rs:966:50: 966:66 error: failed to resolve. Could not find `uint` in `std`
/home/manishearth/Mozilla/rust/src/libgetopts/lib.rs:966     t("\nMary had a little lamb\nLittle lamb\n", ::std::uint::MAX,
                                                                                                          ^~~~~~~~~~~~~~~~
/home/manishearth/Mozilla/rust/src/libgetopts/lib.rs:966:50: 966:66 error: unresolved name `std::uint::MAX`
/home/manishearth/Mozilla/rust/src/libgetopts/lib.rs:966     t("\nMary had a little lamb\nLittle lamb\n", ::std::uint::MAX,
                                                                                                          ^~~~~~~~~~~~~~~~
error: aborting due to 2 previous errors
make: *** [x86_64-unknown-linux-gnu/stage1/test/getoptstest-x86_64-unknown-linux-gnu] Error 101
make: *** Waiting for unfinished jobs....
/home/manishearth/Mozilla/rust/src/libstd/old_io/mod.rs:1618:10: 1618:11 warning: the type parameter `T` is not constrained by the impl trait, self type, or predicates
/home/manishearth/Mozilla/rust/src/libstd/old_io/mod.rs:1618 impl<'a, T, A: ?Sized + Acceptor<T>> Iterator for IncomingConnections<'a, A> {
                                                                      ^
/home/manishearth/Mozilla/rust/src/libstd/thread.rs:818:21: 818:31 error: mismatched types:
 expected `u32`,
    found `usize`
(expected u32,
    found usize) [E0308]
/home/manishearth/Mozilla/rust/src/libstd/thread.rs:818             tx.send(x_in_child).unwrap();
                                                                            ^~~~~~~~~~
<core macros>:5:24: 5:35 error: mismatched types:
 expected `usize`,
    found `u32`
(expected usize,
    found u32) [E0308]
<core macros>:5 if ! ( ( * left_val == * right_val ) && ( * right_val == * left_val ) ) {
                                       ^~~~~~~~~~~
<core macros>:1:1: 9:39 note: in expansion of assert_eq!
/home/manishearth/Mozilla/rust/src/libstd/thread.rs:822:9: 822:45 note: expansion site
<core macros>:5:58: 5:68 error: mismatched types:
 expected `u32`,
    found `usize`
(expected u32,
    found usize) [E0308]
<core macros>:5 if ! ( ( * left_val == * right_val ) && ( * right_val == * left_val ) ) {
                                                                         ^~~~~~~~~~
<core macros>:1:1: 9:39 note: in expansion of assert_eq!
/home/manishearth/Mozilla/rust/src/libstd/thread.rs:822:9: 822:45 note: expansion site
/home/manishearth/Mozilla/rust/src/libstd/thread.rs:859:24: 859:35 error: mismatched types:
 expected `usize`,
    found `u32`
(expected usize,
    found u32) [E0308]
/home/manishearth/Mozilla/rust/src/libstd/thread.rs:859                 if x < GENERATIONS {
                                                                               ^~~~~~~~~~~
error: aborting due to 4 previous errors
make: *** [x86_64-unknown-linux-gnu/stage1/test/stdtest-x86_64-unknown-linux-gnu] Error 101

Could you try to make sure check-stage1 passes?

Manishearth · 2015-02-28T12:56:51Z

@bors: r-

GuillaumeGomez · 2015-03-01T22:28:03Z

Tests have been fixed. @alexcrichton @Manishearth

Manishearth · 2015-03-01T22:29:13Z

@bors: r=alexcrichton 6d74279

bors · 2015-03-02T11:21:27Z

⌛ Testing commit 6d74279 with merge 1cc8b6e...

…alexcrichton Part of #22240.

bors · 2015-03-02T14:29:52Z

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-x-android-t, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-win-32-nopt-t, auto-win-32-opt, auto-win-64-nopt-t, auto-win-64-opt

tbu- · 2015-03-02T20:29:12Z

@Manishearth This looks incorrect, it is casting a pointer to a u32. (Also it uses isize for an integer where it is unnecessary, but that's incorrect, just missed while replacing.)

Manishearth · 2015-03-02T20:33:32Z

Where? Can you file a followup bug or pull-request?

GuillaumeGomez · 2015-03-02T21:24:35Z

You're talking about the change in the tests ? I didn't see that. Erf... Sorry about that...

tbu- · 2015-03-02T21:29:02Z

I'm working on it.

Conflicts: src/libstd/thread.rs

rust-highfive assigned aturon Feb 18, 2015

aturon reviewed Feb 18, 2015
View reviewed changes

Replace int/uint by isize/usize

6d74279

bors added a commit that referenced this pull request Mar 2, 2015

Auto merge of #22510 - GuillaumeGomez:audit-integer-libstd-thread, r=…

1cc8b6e

…alexcrichton Part of #22240.

bors merged commit 6d74279 into rust-lang:master Mar 2, 2015

bors mentioned this pull request Mar 2, 2015

overloaded-box protocol changes #22086

Closed

GuillaumeGomez deleted the audit-integer-libstd-thread branch March 2, 2015 21:24

huonw mentioned this pull request Mar 2, 2015

Fixup for #22510 #22982

Closed

tbu- added a commit to tbu-/rust that referenced this pull request Mar 3, 2015

Revert incorrect usize -> u32 replacements from rust-lang#22510

22c204a

Manishearth pushed a commit to Manishearth/rust that referenced this pull request Mar 3, 2015

Revert incorrect usize -> u32 replacements from rust-lang#22510

d18897c

Conflicts: src/libstd/thread.rs

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replace int/uint by isize/usize in libstd/thread.rs #22510

Replace int/uint by isize/usize in libstd/thread.rs #22510

GuillaumeGomez commented Feb 18, 2015

rust-highfive commented Feb 18, 2015

aturon Feb 18, 2015

alexcrichton commented Feb 24, 2015

GuillaumeGomez commented Feb 26, 2015

alexcrichton commented Feb 27, 2015

GuillaumeGomez commented Feb 27, 2015

alexcrichton commented Feb 27, 2015

bors commented Feb 27, 2015

bors commented Feb 27, 2015

alexcrichton commented Feb 27, 2015

bors commented Feb 27, 2015

bors commented Feb 27, 2015

alexcrichton commented Feb 27, 2015

alexcrichton commented Feb 28, 2015

Manishearth commented Feb 28, 2015

Manishearth commented Feb 28, 2015

GuillaumeGomez commented Mar 1, 2015

Manishearth commented Mar 1, 2015

bors commented Mar 2, 2015

bors commented Mar 2, 2015

tbu- commented Mar 2, 2015

Manishearth commented Mar 2, 2015

GuillaumeGomez commented Mar 2, 2015

tbu- commented Mar 2, 2015

Replace int/uint by isize/usize in libstd/thread.rs #22510

Replace int/uint by isize/usize in libstd/thread.rs #22510

Conversation

GuillaumeGomez commented Feb 18, 2015

rust-highfive commented Feb 18, 2015

aturon Feb 18, 2015

Choose a reason for hiding this comment

alexcrichton commented Feb 24, 2015

GuillaumeGomez commented Feb 26, 2015

alexcrichton commented Feb 27, 2015

GuillaumeGomez commented Feb 27, 2015

alexcrichton commented Feb 27, 2015

bors commented Feb 27, 2015

bors commented Feb 27, 2015

alexcrichton commented Feb 27, 2015

bors commented Feb 27, 2015

bors commented Feb 27, 2015

alexcrichton commented Feb 27, 2015

alexcrichton commented Feb 28, 2015

Manishearth commented Feb 28, 2015

Manishearth commented Feb 28, 2015

GuillaumeGomez commented Mar 1, 2015

Manishearth commented Mar 1, 2015

bors commented Mar 2, 2015

bors commented Mar 2, 2015

tbu- commented Mar 2, 2015

Manishearth commented Mar 2, 2015

GuillaumeGomez commented Mar 2, 2015

tbu- commented Mar 2, 2015