about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-05-17 16:11:20 +0000
committerbors <bors@rust-lang.org>2019-05-17 16:11:20 +0000
commit823a75d9ba34860b9a6712c7a9d35e86e0a88436 (patch)
tree245f454ef9bd811ce7bfc3b27fde1b417d486cc6 /src/liballoc
parentb982867a7349f84c17317599b59aeb5a7d8a83be (diff)
parent3c9790e4293e41a1a45a50eaee4e76a1fb64d5f8 (diff)
downloadrust-823a75d9ba34860b9a6712c7a9d35e86e0a88436.tar.gz
rust-823a75d9ba34860b9a6712c7a9d35e86e0a88436.zip
Auto merge of #60841 - alexcrichton:update-compiler-builtins, r=RalfJung
Update the compiler_builtins crate

This updates to 0.1.13 for `compiler_builtins`, published to fix a few
issues. The feature changes here are updated because `compiler_builtins`
no longer enables the `c` feature by default but we want to do so
through our build still.

Closes #60747
Closes #60782
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/Cargo.toml1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/liballoc/Cargo.toml b/src/liballoc/Cargo.toml
index ddf0044c506..bcb27bb5161 100644
--- a/src/liballoc/Cargo.toml
+++ b/src/liballoc/Cargo.toml
@@ -33,3 +33,4 @@ harness = false
 
 [features]
 compiler-builtins-mem = ['compiler_builtins/mem']
+compiler-builtins-c = ["compiler_builtins/c"]