OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix failing tests

Browse Source
This commit is contained in:
Vadim Petrochenkov 2019-07-08 01:00:54 +03:00
parent baddce5155
commit 7b74d72d9a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/librustc/ty/query/on_disk_cache.rs
View File

@ -610,8 +610,9 @@ impl<'a, 'tcx> SpecializedDecoder<Span> for CacheDecoder<'a, 'tcx> {
}
TAG_EXPANSION_INFO_SHORTHAND => {
let pos = AbsoluteBytePos::decode(self)?;
if let Some(cached_ctxt) = self.synthetic_expansion_infos.borrow().get(&pos) {
Span::new(lo, hi, *cached_ctxt)
let cached_ctxt = self.synthetic_expansion_infos.borrow().get(&pos).cloned();
if let Some(ctxt) = cached_ctxt {
Span::new(lo, hi, ctxt)
} else {
let expn_info =
self.with_position(pos.to_usize(), |this| ExpnInfo::decode(this))?;

4
src/test/ui/feature-gates/feature-gate-custom_test_frameworks.stderr
View File

@ -1,8 +1,8 @@
error[E0658]: use of unstable library feature 'custom_test_frameworks': custom test frameworks are an unstable feature
--> $DIR/feature-gate-custom_test_frameworks.rs:3:1
--> $DIR/feature-gate-custom_test_frameworks.rs:3:3
|
LL | #[test_case]
| ^^^^^^^^^^^^
| ^^^^^^^^^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/50297
= help: add `#![feature(custom_test_frameworks)]` to the crate attributes to enable