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

MIR-borrowck: Some minor fixes #46040

Merged
merged 3 commits into from
Nov 22, 2017
Merged

MIR-borrowck: Some minor fixes #46040

merged 3 commits into from
Nov 22, 2017

Conversation

zilbuz
Copy link
Contributor

@zilbuz zilbuz commented Nov 16, 2017

@arielb1
Copy link
Contributor

arielb1 commented Nov 16, 2017

@bors r+

@bors
Copy link
Contributor

bors commented Nov 16, 2017

📌 Commit 4beca6a has been approved by arielb1

@kennytm kennytm added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 16, 2017
@nikomatsakis nikomatsakis self-assigned this Nov 18, 2017
@bors
Copy link
Contributor

bors commented Nov 19, 2017

⌛ Testing commit 4beca6aad36086532078c205e97dad9d8526272e with merge 98e3158b7619099a2debf23ba36fa43af16e8f86...

@eddyb
Copy link
Member

eddyb commented Nov 19, 2017

@bors retry (giving priority to #45225)

@bors
Copy link
Contributor

bors commented Nov 19, 2017

⌛ Testing commit 4beca6aad36086532078c205e97dad9d8526272e with merge 99559815fe2011b10892b9666aa4fbea548ddff3...

@bors
Copy link
Contributor

bors commented Nov 19, 2017

💔 Test failed - status-travis

@kennytm
Copy link
Member

kennytm commented Nov 19, 2017

UI test failure in ui/nll/get_default.rs, some left out fixes regarding #45185.

 error[E0502]: cannot borrow `*map` as mutable because it is also borrowed as immutable (Ast)
   --> $DIR/get_default.rs:33:17
    |
 28 |         match map.get() {
    |               --- immutable borrow occurs here
 ...
 33 |                 map.set(String::new()); // Just AST errors here
    |                 ^^^ mutable borrow occurs here
 ...
 37 | }
    | - immutable borrow ends here
 
 error[E0502]: cannot borrow `*map` as mutable because it is also borrowed as immutable (Ast)
   --> $DIR/get_default.rs:43:17
    |
 41 |         match map.get() {
    |               --- immutable borrow occurs here
 42 |             Some(v) => {
 43 |                 map.set(String::new()); // Both AST and MIR error here
    |                 ^^^ mutable borrow occurs here
 ...
 51 | }
    | - immutable borrow ends here
 
 error[E0502]: cannot borrow `*map` as mutable because it is also borrowed as immutable (Ast)
   --> $DIR/get_default.rs:47:17
    |
 41 |         match map.get() {
    |               --- immutable borrow occurs here
 ...
 47 |                 map.set(String::new()); // Just AST errors here
    |                 ^^^ mutable borrow occurs here
 ...
 51 | }
    | - immutable borrow ends here
 
-error[E0502]: cannot borrow `(*map)` as mutable because it is also borrowed as immutable (Mir)
+error[E0502]: cannot borrow `*map` as mutable because it is also borrowed as immutable (Mir)
   --> $DIR/get_default.rs:43:17
    |
 41 |         match map.get() {
    |               --- immutable borrow occurs here
 42 |             Some(v) => {
 43 |                 map.set(String::new()); // Both AST and MIR error here
    |                 ^^^ mutable borrow occurs here
 
 error: aborting due to 4 previous errors

@kennytm kennytm added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 19, 2017
@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Nov 20, 2017

📌 Commit 2285e35 has been approved by nikomatsakis

@kennytm kennytm added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 21, 2017
@bors
Copy link
Contributor

bors commented Nov 22, 2017

⌛ Testing commit 2285e35 with merge 96e9cee...

bors added a commit that referenced this pull request Nov 22, 2017
MIR-borrowck: Some minor fixes

- Remove parens when printing dereference (fix #45185)
- Change argument type of `autoderef` to `bool`
- Change argument type of `field_index` to `Field`
@bors
Copy link
Contributor

bors commented Nov 22, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing 96e9cee to master...

@bors bors merged commit 2285e35 into rust-lang:master Nov 22, 2017
@zilbuz zilbuz deleted the mir-misc branch November 25, 2017 11:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

MIR-borrowck: dereferences are printed wrapped in parens
6 participants