Auto merge of #1553 - RalfJung:rustup, r=RalfJung

rustup

Cc `@oli-obk`
This commit is contained in:
bors
2020-09-20 11:14:29 +00:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -1 +1 @@
a3bc0e752fad96f537b73f4e9bc805a73d404f7b
5e449b9adff463455743291b0c1f76feec092992
+1 -1
View File
@@ -59,7 +59,7 @@ fn eval_path_scalar(
let this = self.eval_context_mut();
let instance = this.resolve_path(path);
let cid = GlobalId { instance, promoted: None };
let const_val = this.const_eval_raw(cid)?;
let const_val = this.eval_to_allocation(cid)?;
let const_val = this.read_scalar(const_val.into())?;
return Ok(const_val);
}