Skip to content

Commit 70cc11b

Browse files
committed
Bump to 2019-06-22 to get fix from upstream
We need commit d46a373b391cb546f5a737fd5009f7733c220531 (rust-lang/rust#61959) to avoid a compiler ICE when using simd builtins.
1 parent 6664496 commit 70cc11b

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

c2rust-refactor/src/context.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -425,14 +425,14 @@ impl<'a, 'tcx> RefactorCtxt<'a, 'tcx> {
425425

426426
/// Attempt to resolve a `Use` item to the `hir::Path` of the imported item. The
427427
/// given item _must_ be a `Use`.
428-
pub fn resolve_use(&self, u: &Item) -> P<hir::Path> {
428+
pub fn resolve_use(&self, u: &Item) -> &P<hir::Path> {
429429
let hir_node = self
430430
.hir_map()
431431
.find(u.id)
432432
.unwrap_or_else(|| panic!("Couldn't find HIR node for {:?}", u));
433433
let hir_item = expect!([hir_node] hir::Node::Item(i) => i);
434434
let path = expect!([&hir_item.node] hir::ItemKind::Use(path, _) => path);
435-
path.clone()
435+
path
436436
}
437437

438438
/// Compare two items for internal structural equivalence, ignoring field names.

rust-toolchain

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2019-06-20
1+
nightly-2019-06-22

scripts/common.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ class Config:
9797
MIN_PLUMBUM_VERSION = (1, 6, 3)
9898
CC_DB_JSON = "compile_commands.json"
9999

100-
CUSTOM_RUST_NAME = 'nightly-2019-06-20'
100+
CUSTOM_RUST_NAME = 'nightly-2019-06-22'
101101

102102
"""
103103
Reflect changes to all configuration variables that depend on LLVM_VER

0 commit comments

Comments
 (0)