mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rustup to rustc 1.30.0-nightly (4591a245c 2018-09-22)

Browse Source
This commit is contained in:
bjorn3 2018-09-23 10:16:26 +02:00
parent a83e7766b7
commit 5b721a2940
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Cargo.lock generated
View File

@ -135,7 +135,7 @@ source = "git+https://github.com/CraneStation/cranelift.git#dcd54af61885eb5ba93d
dependencies = [
"cranelift-codegen 0.21.1 (git+https://github.com/CraneStation/cranelift.git)",
"cranelift-module 0.21.1 (git+https://github.com/CraneStation/cranelift.git)",
"faerie 0.5.0 (git+https://github.com/m4b/faerie.git?branch=mach_data_relocations)",
"faerie 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"failure 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"goblin 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
"target-lexicon 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
@ -218,8 +218,8 @@ dependencies = [
[[package]]
name = "faerie"
version = "0.5.0"
source = "git+https://github.com/m4b/faerie.git?branch=mach_data_relocations#c8587ada91fd0af6961e0a884fa44454efbb2a21"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)",
"failure 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -423,7 +423,7 @@ dependencies = [
"cranelift-faerie 0.21.1 (git+https://github.com/CraneStation/cranelift.git)",
"cranelift-module 0.21.1 (git+https://github.com/CraneStation/cranelift.git)",
"cranelift-simplejit 0.21.1 (git+https://github.com/CraneStation/cranelift.git)",
"faerie 0.5.0 (git+https://github.com/m4b/faerie.git?branch=mach_data_relocations)",
"faerie 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"target-lexicon 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -674,7 +674,7 @@ dependencies = [
"checksum env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)" = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38"
"checksum errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c2a071601ed01b988f896ab14b95e67335d1eeb50190932a1320f7fe3cadc84e"
"checksum errno-dragonfly 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "14ca354e36190500e1e1fb267c647932382b54053c50b14970856c0b00a35067"
"checksum faerie 0.5.0 (git+https://github.com/m4b/faerie.git?branch=mach_data_relocations)" = "<none>"
"checksum faerie 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a4c878c9fe0eb38d5fe1a09c5df7348253b7e6a67868fd8540be525dc04d63cb"
"checksum failure 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7efb22686e4a466b1ec1a15c2898f91fa9cb340452496dca654032de20ff95b9"
"checksum failure_derive 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "946d0e98a50d9831f5d589038d2ca7f8f455b1c21028c0db0e84116a12696426"
"checksum gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)" = "5e33ec290da0d127825013597dbdfc28bee4964690c7ce1166cbc2a7bd08b1bb"

6
Cargo.toml
View File

@ -19,7 +19,7 @@ cranelift-simplejit = { git = "https://github.com/CraneStation/cranelift.git" }
cranelift-faerie = { git = "https://github.com/CraneStation/cranelift.git" }
target-lexicon = "0.0.3"
#goblin = "0.0.17"
faerie = "0.5.0"
faerie = "0.5.1"
ar = "0.6.0"
bitflags = "1.0.3"
byteorder = "1.2.6"
@ -30,7 +30,3 @@ byteorder = "1.2.6"
#cranelift-module = { path = "../cranelift/lib/module" }
#cranelift-simplejit = { path = "../cranelift/lib/simplejit" }
#cranelift-faerie = { path = "../cranelift/lib/faerie" }
[patch.crates-io]
# Use https://github.com/m4b/faerie/pull/47, because faerie 0.5.0 doesn't create valid Mach-O binaries
faerie = { git = "https://github.com/m4b/faerie.git", branch = "mach_data_relocations" }

2
src/base.rs
View File

@ -629,7 +629,7 @@ fn trans_stmt<'a, 'tcx: 'a>(
StatementKind::StorageLive(_)
| StatementKind::StorageDead(_)
| StatementKind::Nop
| StatementKind::ReadForMatch(_)
| StatementKind::FakeRead(..)
| StatementKind::Validate(_, _)
| StatementKind::EndRegion(_)
| StatementKind::AscribeUserType(..) => {}