about summary refs log tree commit diff
path: root/src/rustllvm/RustWrapper.cpp
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-09-04 22:27:00 +0000
committerbors <bors@rust-lang.org>2018-09-04 22:27:00 +0000
commit4dcf42f985f2d3e12f91d465a6a10f8b1d6782bf (patch)
treec3f1715f1897de8988d09622719793b57c636938 /src/rustllvm/RustWrapper.cpp
parent94a96e25cb3fc3f087093750aec1e40c8a82ae49 (diff)
parentdd9a03e8ff5dcf697466bb27945743eacae4bf99 (diff)
downloadrust-4dcf42f985f2d3e12f91d465a6a10f8b1d6782bf.tar.gz
rust-4dcf42f985f2d3e12f91d465a6a10f8b1d6782bf.zip
Auto merge of #53944 - oli-obk:beta, r=nikomatsakis
[beta] Properly prevent the promotion of unstable const fns

backport of https://github.com/rust-lang/rust/pull/53699

r? @nikomatsakis (the other PR was merged and beta nominated but not beta approved)
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
0 files changed, 0 insertions, 0 deletions