diff options
| author | bors <bors@rust-lang.org> | 2022-12-02 12:03:59 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-12-02 12:03:59 +0000 |
| commit | cef44f53034eac46be3a0e3eec7b2b3d4ef5140b (patch) | |
| tree | 2354b0ac401b6a477bb76396f5832bf6199ae56d /library/std | |
| parent | 11663b1b4857ffeafbd85a9a36c234d117373b76 (diff) | |
| parent | 8e059d5968c8f695fe53835c78f60fff6759b438 (diff) | |
| download | rust-cef44f53034eac46be3a0e3eec7b2b3d4ef5140b.tar.gz rust-cef44f53034eac46be3a0e3eec7b2b3d4ef5140b.zip | |
Auto merge of #105166 - matthiaskrgr:rollup-s9l6vt2, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #104614 (Add `type_ascribe!` macro as placeholder syntax for type ascription) - #105126 (Make `VecDeque::new_in` unstably const) - #105132 (Migrate summary toggle filter to CSS variable) - #105136 (clarify comment on Deref promotion) - #105137 (Add tracking issue number for `file_create_new` feature) - #105143 (rustdoc: use simpler CSS for setting the font on scraped examples) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std')
| -rw-r--r-- | library/std/src/fs.rs | 2 | ||||
| -rw-r--r-- | library/std/src/prelude/v1.rs | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/library/std/src/fs.rs b/library/std/src/fs.rs index 188ff00e1f8..0660e03c1a8 100644 --- a/library/std/src/fs.rs +++ b/library/std/src/fs.rs @@ -401,7 +401,7 @@ impl File { /// Ok(()) /// } /// ``` - #[unstable(feature = "file_create_new", issue = "none")] + #[unstable(feature = "file_create_new", issue = "105135")] pub fn create_new<P: AsRef<Path>>(path: P) -> io::Result<File> { OpenOptions::new().read(true).write(true).create_new(true).open(path.as_ref()) } diff --git a/library/std/src/prelude/v1.rs b/library/std/src/prelude/v1.rs index d5ac16e6b94..a5a798078eb 100644 --- a/library/std/src/prelude/v1.rs +++ b/library/std/src/prelude/v1.rs @@ -85,6 +85,15 @@ pub use core::prelude::v1::cfg_accessible; )] pub use core::prelude::v1::cfg_eval; +// Do not `doc(no_inline)` either. +#[unstable( + feature = "type_ascription", + issue = "23416", + reason = "placeholder syntax for type ascription" +)] +#[cfg(not(bootstrap))] +pub use core::prelude::v1::type_ascribe; + // The file so far is equivalent to src/libcore/prelude/v1.rs, // and below to src/liballoc/prelude.rs. // Those files are duplicated rather than using glob imports |