diff options
| author | bors <bors@rust-lang.org> | 2019-09-16 15:35:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-09-16 15:35:48 +0000 |
| commit | a44881d892fb4f4a8ed93f8f392bab942fac7a41 (patch) | |
| tree | 0a4bb12a62fa76fd7946b4efec9a2b3d0cd35cc9 /src/liballoc/string.rs | |
| parent | 16c401167366d7c6deb9268058fc5f254f9d9371 (diff) | |
| parent | f4ff4189ae01b6c2a775c63f24b51b708b74ec02 (diff) | |
| download | rust-a44881d892fb4f4a8ed93f8f392bab942fac7a41.tar.gz rust-a44881d892fb4f4a8ed93f8f392bab942fac7a41.zip | |
Auto merge of #64510 - Centril:rollup-m03zsq8, r=Centril
Rollup of 10 pull requests
Successful merges:
- #63955 (Make sure interned constants are immutable)
- #64028 (Stabilize `Vec::new` and `String::new` as `const fn`s)
- #64119 (ci: ensure all tool maintainers are assignable on issues)
- #64444 (fix building libstd without backtrace feature)
- #64446 (Fix build script sanitizer check.)
- #64451 (when Miri tests are not passing, do not add Miri component)
- #64467 (Hide diagnostics emitted during --cfg parsing)
- #64497 (Don't print the "total" `-Ztime-passes` output if `--prints=...` is also given)
- #64499 (Use `Symbol` in two more functions.)
- #64504 (use println!() instead of println!(""))
Failed merges:
r? @ghost
Diffstat (limited to 'src/liballoc/string.rs')
| -rw-r--r-- | src/liballoc/string.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs index b65f191836e..1166e7b5df2 100644 --- a/src/liballoc/string.rs +++ b/src/liballoc/string.rs @@ -369,7 +369,7 @@ impl String { /// ``` #[inline] #[stable(feature = "rust1", since = "1.0.0")] - #[rustc_const_unstable(feature = "const_string_new")] + #[cfg_attr(bootstrap, rustc_const_unstable(feature = "const_string_new"))] pub const fn new() -> String { String { vec: Vec::new() } } |
