diff options
| author | bors <bors@rust-lang.org> | 2019-12-18 22:03:29 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-12-18 22:03:29 +0000 |
| commit | c605199e89572e586a5f37bc698c48b6a10896fb (patch) | |
| tree | 69671684ad7db442e688570c24dbc7c5fd624adc /src/liballoc/string.rs | |
| parent | 19bd93467617a447c22ec32cc1cf14d40cb84ccf (diff) | |
| parent | 241d2e765dc7401e642812e43b75dbc3950f2c98 (diff) | |
| download | rust-c605199e89572e586a5f37bc698c48b6a10896fb.tar.gz rust-c605199e89572e586a5f37bc698c48b6a10896fb.zip | |
Auto merge of #67402 - Mark-Simulacrum:stage0-step, r=alexcrichton
Switch bootstrap to 1.41 This updates the version number for master to 1.42 and switches the bootstrap compiler to yesterday's beta. Fallout of cfg(bootstrap) changes is also dealt with.
Diffstat (limited to 'src/liballoc/string.rs')
| -rw-r--r-- | src/liballoc/string.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs index bf9bbba4753..f880f5915a3 100644 --- a/src/liballoc/string.rs +++ b/src/liballoc/string.rs @@ -367,10 +367,7 @@ impl String { /// let s = String::new(); /// ``` #[inline] - #[cfg_attr( - not(bootstrap), - rustc_const_stable(feature = "const_string_new", since = "1.32.0"), - )] + #[rustc_const_stable(feature = "const_string_new", since = "1.32.0")] #[stable(feature = "rust1", since = "1.0.0")] pub const fn new() -> String { String { vec: Vec::new() } |