8000 Rollup of 11 pull requests by matthiaskrgr · Pull Request #104418 · rust-lang/rust · GitHub
[go: up one dir, main page]

Skip to content

Rollup of 11 pull requests #104418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
Nov 15, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
fc380ec
Adjust `tcp_quickack` feature to allow other `os::linux::net` features.
jmillikin Sep 18, 2022
8f1e6eb
Move `unix_socket_abstract` feature API to `SocketAddrExt`.
jmillikin Sep 18, 2022
12c15a2
Split out from_u32_unchecked from const_char_convert
est31 Sep 29, 2022
176c44c
Stabilize const_char_convert
est31 Sep 29, 2022
f902b49
Don't print full paths in overlap errors
compiler-errors Nov 10, 2022
c2b906b
Recover from fn ptr tys with generic param list
fmease Nov 10, 2022
93921dd
Don't ICE with inline const errors during MIR build
compiler-errors Nov 11, 2022
d8c0fef
Fixed some `_i32` notation in `maybe_uninit`’s doc
Elarcis Nov 12, 2022
442f848
fix some typos in comments
cuishuang Nov 13, 2022
56dfb70
use `EXE_EXTENSION` while searching for python
SparkyPotato Nov 13, 2022
7982d6a
interpret: make check_mplace public
RalfJung Nov 13, 2022
8e81cc2
rustdoc: Resolve doc links in external traits having local impls
petrochenkov Nov 13, 2022
6de5f62
Bump chalk to v0.87
compiler-errors Nov 13, 2022
36a1068
Make rustc build with new chalk
compiler-errors Nov 13, 2022
9f3786b
Rollup merge of #101967 - jmillikin:linux-abstract-socket-addr, r=jos…
matthiaskrgr Nov 8000 14, 2022
8c77da8
Rollup merge of #102470 - est31:stabilize_const_char_convert, r=josht…
matthiaskrgr Nov 14, 2022
a86bdb4
Rollup merge of #104223 - fmease:recover-fn-ptr-with-generics, r=este…
matthiaskrgr Nov 14, 2022
abda584
Rollup merge of #104229 - compiler-errors:overlap-full-path, r=davidtwco
matthiaskrgr Nov 14, 2022
f8e5b1c
Rollup merge of #104294 - compiler-errors:inline-ct-err-in-mir-build,…
matthiaskrgr Nov 14, 2022
43bb507
Rollup merge of #104332 - Elarcis:maybe_uninit_doc_fix, r=m-ou-se
matthiaskrgr Nov 14, 2022
5763fa7
Rollup merge of #104349 - rustaceanclub:master, r=oli-obk
matthiaskrgr Nov 14, 2022
aa29a8b
Rollup merge of #104350 - SparkyPotato:fix-x-wrapper, r=jyn514
matthiaskrgr Nov 14, 2022
050ece6
Rollup merge of #104356 - RalfJung:interpret-check-mplace, r=oli-obk
matthiaskrgr Nov 14, 2022
dc869fc
Rollup merge of #104364 - petrochenkov:docice2, r=GuillaumeGomez
matthiaskrgr Nov 14, 2022
c389097
Rollup merge of #104378 - compiler-errors:chalk-up, r=jackh726
matthiaskrgr Nov 14, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Stabilize const_char_convert
  • Loading branch information
est31 committed Sep 29, 2022
commit 176c44c08ed797b5ddea893a0a292a7bee0d8f8c
6 changes: 3 additions & 3 deletions library/core/src/char/methods.rs
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ impl char {
/// assert_eq!(None, c);
/// ```
#[stable(feature = "assoc_char_funcs", since = "1.52.0")]
#[rustc_const_unstable(feature = "const_char_convert", issue = "89259")]
#[rustc_const_stable(feature = "const_char_convert", since = "CURRENT_RUSTC_VERSION")]
#[must_use]
#[inline]
pub const fn from_u32(i: u32) -> Option<char> {
Expand Down Expand Up @@ -241,7 +241,7 @@ impl char {
/// let _c = char::from_digit(1, 37);
/// ```
#[stable(feature = "assoc_char_funcs", since = "1.52.0")]
#[rustc_const_unstable(feature = "const_char_convert", issue = "89259")]
#[rustc_const_stable(feature = "const_char_convert", since = "CURRENT_RUSTC_VERSION")]
#[must_use]
#[inline]
pub const fn from_digit(num: u32, radix: u32) -> Option<char> {
Expand Down Expand Up @@ -338,7 +338,7 @@ impl char {
/// let _ = '1'.to_digit(37);
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
#[rustc_const_unstable(feature = "const_char_convert", issue = "89259")]
#[rustc_const_stable(feature = "const_char_convert", since = "CURRENT_RUSTC_VERSION")]
#[must_use = "this returns the result of the operation, \
without modifying the original"]
#[inline]
Expand Down
4 changes: 2 additions & 2 deletions library/core/src/char/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ pub fn decode_utf16<I: IntoIterator<Item = u16>>(iter: I) -> DecodeUtf16<I::Into

/// Converts a `u32` to a `char`. Use [`char::from_u32`] instead.
#[stable(feature = "rust1", since = "1.0.0")]
#[rustc_const_unstable(feature = "const_char_convert", issue = "89259")]
#[rustc_const_stable(feature = "const_char_convert", since = "CURRENT_RUSTC_VERSION")]
#[must_use]
#[inline]
pub const fn from_u32(i: u32) -> Option<char> {
Expand All @@ -130,7 +130,7 @@ pub const unsafe fn from_u32_unchecked(i: u32) -> char {

/// Converts a digit in the given radix to a `char`. Use [`char::from_digit`] instead.
#[stable(feature = "rust1", since = "1.0.0")]
#[rustc_const_unstable(feature = "const_char_convert", issue = "89259")]
#[rustc_const_stable(feature = "const_char_convert", since = "CURRENT_RUSTC_VERSION")]
#[must_use]
#[inline]
pub const fn from_digit(num: u32, radix: u32) -> Option<char> {
Expand Down
1 change: 0 additions & 1 deletion library/core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@
#![feature(const_black_box)]
#![feature(const_caller_location)]
#![feature(const_cell_into_inner)]
#![feature(const_char_convert)]
#![feature(const_char_from_u32_unchecked)]
#![feature(const_clone)]
#![feature(const_cmp)]
Expand Down
0