diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-05-29 00:19:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-29 00:19:55 +0200 |
| commit | ee08261c8c5bef635ff38f6d617bb7b72dd470cd (patch) | |
| tree | a50a6ad4aa4fcb5655d41562fb9d867a04ad3e9d /src/test | |
| parent | e19a229c88e39bc00f5672ff6a539aabe69bb545 (diff) | |
| parent | 95013e612d3ffaee2b674da4a29308aaa7551726 (diff) | |
| download | rust-ee08261c8c5bef635ff38f6d617bb7b72dd470cd.tar.gz rust-ee08261c8c5bef635ff38f6d617bb7b72dd470cd.zip | |
Rollup merge of #60928 - TheSirC:fix/60229, r=eddyb
Changes the type `mir::Mir` into `mir::Body` Fixes part 1 of #60229 (previously attempted in #60242). I stumbled upon the issue and it seems that the previous attempt at solving it was not merged. This is a second try more up-to-date. The commit should have changed comments as well. At the time of writting, it passes the tidy and check tool.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/run-pass/regions/regions-lub-ref-ref-rc.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/test/run-pass/regions/regions-lub-ref-ref-rc.rs b/src/test/run-pass/regions/regions-lub-ref-ref-rc.rs index cd095f6f3a4..96c71b084b1 100644 --- a/src/test/run-pass/regions/regions-lub-ref-ref-rc.rs +++ b/src/test/run-pass/regions/regions-lub-ref-ref-rc.rs @@ -11,16 +11,16 @@ use std::rc::Rc; #[derive(Clone)] -enum CachedMir<'mir> { +enum Cached<'mir> { Ref(&'mir String), Owned(Rc<String>), } -impl<'mir> CachedMir<'mir> { +impl<'mir> Cached<'mir> { fn get_ref<'a>(&'a self) -> &'a String { match *self { - CachedMir::Ref(r) => r, - CachedMir::Owned(ref rc) => &rc, + Cached::Ref(r) => r, + Cached::Owned(ref rc) => &rc, } } } |
