-
Notifications
You must be signed in to change notification settings - Fork 12.8k
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
Split up ptr/mod.rs in libcore... #67163
Conversation
(rust_highfive has picked a reviewer for you, use r? to override) |
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
0ab9569
to
5282170
Compare
☔ The latest upstream changes (presumably #67184) made this pull request unmergeable. Please resolve the merge conflicts. |
5282170
to
28e5f18
Compare
5c0c6fa
to
3259a0d
Compare
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
☔ The latest upstream changes (presumably #67136) made this pull request unmergeable. Please resolve the merge conflicts. |
3259a0d
to
0240649
Compare
r=me with a rebase |
0240649
to
40e9e3c
Compare
@bors r+ Thanks! |
📌 Commit 40e9e3c8f1d6f38e8cb868afdb4e0626f4e89ac4 has been approved by |
🌲 The tree is currently closed for pull requests below priority 100, this pull request will be tested once the tree is reopened |
Oh, it looks like you've actually included a few submodule updates in that rebase, presumably by accident? -- @bors r- |
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
296d0d8
to
5fe2c65
Compare
No worries! Happens to all of us. @bors r+ |
📌 Commit 5fe2c65e5f099185d4117907744a325bc329425a has been approved by |
🌲 The tree is currently closed for pull requests below priority 100, this pull request will be tested once the tree is reopened |
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
Looks like we've edited the files and presumably rebasing lost those changes? @bors r- |
5fe2c65
to
af080e3
Compare
Yeah, i messed that one up! I redid my changes now, should contain the last and correct changes now. |
☔ The latest upstream changes (presumably #67402) made this pull request unmergeable. Please resolve the merge conflicts. |
af080e3
to
c1b4666
Compare
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
…nst ptr and the other with mut ptr
c1b4666
to
12d65c2
Compare
@bors r+ rollup=never Thank you! Going to mark this so as to not roll it up as it's somewhat prone to rebase failure. |
📌 Commit 12d65c2 has been approved by |
Thank you, for your patience. I am new to rebases, so I am sorry for my mixups. |
@bors rollup=maybe |
…imulacrum Split up ptr/mod.rs in libcore... ...one with implementation detail for const ptr and the other with mut ptr I am not sure if the "stable since 1.0.0" flags are the correct choice for the two additional mods. Also, is it necessary for them to be "pub"? If so, there should be a good description for them. Closes rust-lang#66891
…imulacrum Split up ptr/mod.rs in libcore... ...one with implementation detail for const ptr and the other with mut ptr I am not sure if the "stable since 1.0.0" flags are the correct choice for the two additional mods. Also, is it necessary for them to be "pub"? If so, there should be a good description for them. Closes rust-lang#66891
Rollup of 6 pull requests Successful merges: - #67130 (Const prop should finish propagation into user defined variables) - #67163 (Split up ptr/mod.rs in libcore...) - #67314 (Don't suppress move errors for union fields) - #67392 (Fix unresolved type span inside async object) - #67404 (Separate region inference logic from error handling better) - #67428 (`is_binding_pat`: use explicit match & include or-pats in grammar) Failed merges: r? @ghost
...one with implementation detail for const ptr and the other with mut ptr
I am not sure if the "stable since 1.0.0" flags are the correct choice for the two additional mods.
Also, is it necessary for them to be "pub"? If so, there should be a good description for them.
Closes #66891