Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use ptr::{null, null_mut} instead of 0 as *{const, mut} #34456

Merged
merged 1 commit into from
Jul 15, 2016

Conversation

tbu-
Copy link
Contributor

@tbu- tbu- commented Jun 24, 2016

No description provided.

@rust-highfive
Copy link
Collaborator

r? @aturon

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

@aturon
Copy link
Member

aturon commented Jun 27, 2016

Thanks!

@bors: r+

@apasel422
Copy link
Contributor

@bors r=aturon

@bors
Copy link
Contributor

bors commented Jul 7, 2016

📌 Commit ceb4e3c has been approved by aturon

@bors
Copy link
Contributor

bors commented Jul 7, 2016

⌛ Testing commit ceb4e3c with merge dc0a71b...

@bors
Copy link
Contributor

bors commented Jul 7, 2016

💔 Test failed - auto-mac-cross-ios-opt

@@ -169,7 +169,7 @@ mod inner {
tv_usec: 0,
};
cvt(unsafe {
libc::gettimeofday(&mut s, 0 as *mut _)
libc::gettimeofday(&mut s, ptr::null_mut())
Copy link
Contributor

Choose a reason for hiding this comment

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

Seems that this file is missing an import of ptr.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Should be fixed.

@apasel422
Copy link
Contributor

Travis output:

src/libstd/sys/unix/time.rs:13:5: 13:8 error: unused import
src/libstd/sys/unix/time.rs:13 use ptr;
                                   ^~~
src/libstd/lib.rs:289:31: 289:39 note: lint level defined here
src/libstd/lib.rs:289 #![cfg_attr(not(stage0), deny(warnings))]

@apasel422
Copy link
Contributor

Travis output:

src/libtest/lib.rs:71:5: 71:13 error: unused import
src/libtest/lib.rs:71 use std::ptr;
                          ^~~~~~~~
src/libtest/lib.rs:34:31: 34:39 note: lint level defined here
src/libtest/lib.rs:34 #![cfg_attr(not(stage0), deny(warnings))]

@tbu-
Copy link
Contributor Author

tbu- commented Jul 7, 2016

Travis successfully compiled the code, so it should be good now.

@apasel422
Copy link
Contributor

@bors: r=aturon

@bors
Copy link
Contributor

bors commented Jul 7, 2016

📌 Commit 8fd087a has been approved by aturon

@eddyb
Copy link
Member

eddyb commented Jul 7, 2016

@bors rollup

Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 8, 2016
Use `ptr::{null, null_mut}` instead of `0 as *{const, mut}`
bors added a commit that referenced this pull request Jul 8, 2016
Rollup of 9 pull requests

- Successful merges: #34097, #34456, #34610, #34612, #34659, #34688, #34691, #34699, #34700
- Failed merges:
@Manishearth
Copy link
Member

@tbu-
Copy link
Contributor Author

tbu- commented Jul 8, 2016

Fixed.

bors added a commit that referenced this pull request Jul 8, 2016
Rollup of 9 pull requests

- Successful merges: #34097, #34456, #34610, #34612, #34659, #34688, #34691, #34699, #34700
- Failed merges:
@bors
Copy link
Contributor

bors commented Jul 8, 2016

☔ The latest upstream changes (presumably #33890) made this pull request unmergeable. Please resolve the merge conflicts.

@tbu-
Copy link
Contributor Author

tbu- commented Jul 12, 2016

Rebased.

@eddyb
Copy link
Member

eddyb commented Jul 12, 2016

@bors r=aturon

@bors
Copy link
Contributor

bors commented Jul 12, 2016

📌 Commit 81e95c1 has been approved by aturon

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jul 15, 2016
Use `ptr::{null, null_mut}` instead of `0 as *{const, mut}`
bors added a commit that referenced this pull request Jul 15, 2016
Rollup of 7 pull requests

- Successful merges: #34456, #34733, #34777, #34794, #34799, #34804, #34818
- Failed merges: #33951
@bors bors merged commit 81e95c1 into rust-lang:master Jul 15, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants