Skip to content

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

Merged
bors merged 1 commit into
rust-lang:masterfrom
tbu-:pr_ptr_null
Jul 15, 2016
Merged

Use ptr::{null, null_mut} instead of 0 as *{const, mut}#34456
bors merged 1 commit into
rust-lang:masterfrom
tbu-:pr_ptr_null

Conversation

@tbu-

@tbu- tbu- commented Jun 24, 2016

Copy link
Copy Markdown
Contributor

No description provided.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @aturon

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

@aturon

aturon commented Jun 27, 2016

Copy link
Copy Markdown
Contributor

Thanks!

@bors: r+

@apasel422

Copy link
Copy Markdown
Contributor

@bors r=aturon

@bors

bors commented Jul 7, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit ceb4e3c has been approved by aturon

@bors

bors commented Jul 7, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit ceb4e3c with merge dc0a71b...

@bors

bors commented Jul 7, 2016

Copy link
Copy Markdown
Collaborator

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

Comment thread src/libstd/sys/unix/time.rs Outdated

Copy link
Copy Markdown
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
Copy Markdown
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
Copy Markdown
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
Copy Markdown
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-

tbu- commented Jul 7, 2016

Copy link
Copy Markdown
Contributor Author

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

@apasel422

Copy link
Copy Markdown
Contributor

@bors: r=aturon

@bors

bors commented Jul 7, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 8fd087a has been approved by aturon

@eddyb

eddyb commented Jul 7, 2016

Copy link
Copy Markdown
Contributor

@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
Copy Markdown
Member

@tbu-

tbu- commented Jul 8, 2016

Copy link
Copy Markdown
Contributor Author

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

bors commented Jul 8, 2016

Copy link
Copy Markdown
Collaborator

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

@tbu-

tbu- commented Jul 12, 2016

Copy link
Copy Markdown
Contributor Author

Rebased.

@eddyb

eddyb commented Jul 12, 2016

Copy link
Copy Markdown
Contributor

@bors r=aturon

@bors

bors commented Jul 12, 2016

Copy link
Copy Markdown
Collaborator

📌 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.

7 participants