diff options
| author | bors <bors@rust-lang.org> | 2018-04-27 16:42:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-04-27 16:42:31 +0000 |
| commit | 3c43aa5677e17dfb9f5004522745a02e21a604a4 (patch) | |
| tree | 7ed9ce8c95dfe3f264a4edef5ef00f05b024589b /src/librustc_mir/transform | |
| parent | 71d3dac4a86d192c2c80948621859da3b363fa50 (diff) | |
| parent | f678bf0ababf77ca224c8110bd6aea5569c698da (diff) | |
| download | rust-3c43aa5677e17dfb9f5004522745a02e21a604a4.tar.gz rust-3c43aa5677e17dfb9f5004522745a02e21a604a4.zip | |
Auto merge of #50102 - Zoxc:query-nomacro, r=michaelwoerister
Move query code outside macros and store query jobs separately from query results Based on https://github.com/rust-lang/rust/pull/50067 r? @michaelwoerister
Diffstat (limited to 'src/librustc_mir/transform')
| -rw-r--r-- | src/librustc_mir/transform/inline.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_mir/transform/inline.rs b/src/librustc_mir/transform/inline.rs index b743cccd36c..2e2f8494146 100644 --- a/src/librustc_mir/transform/inline.rs +++ b/src/librustc_mir/transform/inline.rs @@ -126,7 +126,7 @@ impl<'a, 'tcx> Inliner<'a, 'tcx> { continue; } - let callee_mir = match ty::queries::optimized_mir::try_get(self.tcx, + let callee_mir = match self.tcx.try_get_query::<ty::queries::optimized_mir>( callsite.location.span, callsite.callee) { Ok(callee_mir) if self.should_inline(callsite, callee_mir) => { |