Skip to content

Renamed Arc::try_unique to get_mut#24053

Merged
bors merged 2 commits into
rust-lang:masterfrom
kvark:get_mut
Apr 5, 2015
Merged

Renamed Arc::try_unique to get_mut#24053
bors merged 2 commits into
rust-lang:masterfrom
kvark:get_mut

Conversation

@kvark

@kvark kvark commented Apr 4, 2015

Copy link
Copy Markdown
Contributor

As requested by @kballard in #23844

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @pcwalton

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

@kvark

kvark commented Apr 4, 2015

Copy link
Copy Markdown
Contributor Author

Hmm, the doc check gives me these errors, which I don't know how to fix:

---- arc::get_mut_0 stdout ----
        <anon>:6:22: 6:27 error: unresolved import `alloc::arc::Arc`. Did you mean `self::alloc::arc`?
<anon>:6     use alloc::arc::{Arc, get_mut};
                              ^~~~~
<anon>:6:27: 6:32 error: unresolved import `alloc::arc::get_mut`. Did you mean `self::alloc::arc`?
<anon>:6     use alloc::arc::{Arc, get_mut};
                                   ^~~~~

Comment thread src/liballoc/arc.rs Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think you'll want to leave this fn main wrapper as otherwise the extern crate alloc is injected into the wrong scope.

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.

Ok, that explains it ;)

@alexcrichton alexcrichton assigned alexcrichton and unassigned pcwalton Apr 4, 2015
@kvark kvark force-pushed the get_mut branch 2 times, most recently from f9a4d31 to ec8faf2 Compare April 4, 2015 23:00
@kvark

kvark commented Apr 4, 2015

Copy link
Copy Markdown
Contributor Author

@alexcrichton Please have another look.

@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+ bc1aef3

@bors

bors commented Apr 5, 2015

Copy link
Copy Markdown
Collaborator

⌛ Testing commit bc1aef3 with merge 6d78aa6...

@bors

bors commented Apr 5, 2015

Copy link
Copy Markdown
Collaborator

💔 Test failed - auto-mac-64-nopt-t

@Manishearth

Copy link
Copy Markdown
Member
thread '<unnamed>' panicked at 'assertion failed: !p.wait().unwrap().success()', /Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-nopt-t/build/src/libstd/old_io/process.rs:1139
test old_io::process::tests::test_kill ... FAILED

Might be an intermittent?

@kvark

kvark commented Apr 5, 2015

Copy link
Copy Markdown
Contributor Author

This error seems unrelated

@Manishearth

Copy link
Copy Markdown
Member

@bors: retry

@Manishearth

Copy link
Copy Markdown
Member

(If it passes this time around, we should file it as an intermittent)

@bors

bors commented Apr 5, 2015

Copy link
Copy Markdown
Collaborator

⌛ Testing commit bc1aef3 with merge de6742b...

bors added a commit that referenced this pull request Apr 5, 2015
@bors

bors commented Apr 5, 2015

Copy link
Copy Markdown
Collaborator

@bors bors merged commit bc1aef3 into rust-lang:master Apr 5, 2015
@Manishearth Manishearth mentioned this pull request Apr 5, 2015
13 tasks
@kvark kvark deleted the get_mut branch April 5, 2015 21:35
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.

6 participants