Skip to content

Rollup of 6 pull requests #112739

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.

Sign up for GitHub

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 16 commits into from
Jun 17, 2023
Merged

Rollup of 6 pull requests #112739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e99f7ed
Fix documentation build on FreeBSD
dankm Jun 6, 2023
88b0858
Correct types in method descriptions of `NonZero*` types
zica87 Jun 15, 2023
9f50942
Unify history interactions in search
GuillaumeGomez Jun 16, 2023
f431639
Fix invalid handling of "going back in history" when "Directly go to …
GuillaumeGomez Jun 16, 2023
ea55d25
Add regression test for #112676
GuillaumeGomez Jun 16, 2023
4c6fd75
Replace fvdl with ffx, allow test without install
Jun 16, 2023
08d3065
Fix --rust-build flag in docs
tmandry Jun 16, 2023
12c6f1d
Fix edit fail
tmandry Jun 16, 2023
3dc793e
fix ICE on specific malformed asm clobber_abi
asquared31415 Jun 15, 2023
3eddb29
Add `<meta charset="utf-8">` to `-Zdump-mir-spanview` output
Zalathar Jun 17, 2023
d2120b7
Rollup merge of #112352 - dankm:fbsd_doc_fix, r=thomcc
matthiaskrgr Jun 17, 2023
ba3e535
Rollup merge of #112644 - zica87:nonZeroTypes, r=Mark-Simulacrum
matthiaskrgr Jun 17, 2023
7051c84
Rollup merge of #112683 - asquared31415:asm_clobber_ice, r=compiler-e…
matthiaskrgr Jun 17, 2023
63799ba
Rollup merge of #112707 - GuillaumeGomez:back-in-history-fix, r=notri…
matthiaskrgr Jun 17, 2023
c342593
Rollup merge of #112719 - djkoloski:fuchsia_test_runner_remove_fvdl, …
matthiaskrgr Jun 17, 2023
981a2a2
Rollup merge of #112728 - Zalathar:spanview-charset, r=Nilstrieb
matthiaskrgr Jun 17, 2023
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
6 changes: 1 addition & 5 deletions compiler/rustc_builtin_macros/src/asm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,16 +379,12 @@ fn parse_clobber_abi<'a>(p: &mut Parser<'a>, args: &mut AsmArgs) -> PResult<'a,
}

let mut new_abis = Vec::new();
loop {
while !p.eat(&token::CloseDelim(Delimiter::Parenthesis)) {
match p.parse_str_lit() {
Ok(str_lit) => {
new_abis.push((str_lit.symbol_unescaped, str_lit.span));
}
Err(opt_lit) => {
// If the non-string literal is a closing paren then it's the end of the list and is fine
if p.eat(&token::CloseDelim(Delimiter::Parenthesis)) {
break;
}
let span = opt_lit.map_or(p.token.span, |lit| lit.span);
let mut err =
p.sess.span_diagnostic.struct_span_err(span, "expected string literal");
Expand Down
5 changes: 3 additions & 2 deletions compiler/rustc_middle/src/mir/spanview.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ const ANNOTATION_LEFT_BRACKET: char = '\u{298a}'; // Unicode `Z NOTATION RIGHT B
const ANNOTATION_RIGHT_BRACKET: char = '\u{2989}'; // Unicode `Z NOTATION LEFT BINDING BRACKET`
const NEW_LINE_SPAN: &str = "</span>\n<span class=\"line\">";
const HEADER: &str = r#"<!DOCTYPE html>
<html>
<head>"#;
<html lang="en">
<head>
<meta charset="utf-8">"#;
const START_BODY: &str = r#"</head>
<body>"#;
const FOOTER: &str = r#"</body>
Expand Down
21 changes: 12 additions & 9 deletions library/core/src/num/nonzero.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ macro_rules! nonzero_unsigned_operations {
}

/// Adds an unsigned integer to a non-zero value.
#[doc = concat!("Return [`", stringify!($Int), "::MAX`] on overflow.")]
#[doc = concat!("Return [`", stringify!($Ty), "::MAX`] on overflow.")]
///
/// # Examples
///
Expand Down Expand Up @@ -579,7 +579,7 @@ macro_rules! nonzero_signed_operations {

/// Checked absolute value.
/// Checks for overflow and returns [`None`] if
#[doc = concat!("`self == ", stringify!($Int), "::MIN`.")]
#[doc = concat!("`self == ", stringify!($Ty), "::MIN`.")]
/// The result cannot be zero.
///
/// # Example
Expand Down Expand Up @@ -800,7 +800,8 @@ macro_rules! nonzero_signed_operations {
self.get().is_negative()
}

/// Checked negation. Computes `-self`, returning `None` if `self == i32::MIN`.
/// Checked negation. Computes `-self`,
#[doc = concat!("returning `None` if `self == ", stringify!($Ty), "::MIN`.")]
///
/// # Example
///
Expand Down Expand Up @@ -859,8 +860,10 @@ macro_rules! nonzero_signed_operations {
((unsafe { $Ty::new_unchecked(result) }), overflow)
}

/// Saturating negation. Computes `-self`, returning `MAX` if
/// `self == i32::MIN` instead of overflowing.
/// Saturating negation. Computes `-self`,
#[doc = concat!("returning [`", stringify!($Ty), "::MAX`]")]
#[doc = concat!("if `self == ", stringify!($Ty), "::MIN`")]
/// instead of overflowing.
///
/// # Example
///
Expand Down Expand Up @@ -993,7 +996,7 @@ macro_rules! nonzero_unsigned_signed_operations {
}

/// Multiplies two non-zero integers together.
#[doc = concat!("Return [`", stringify!($Int), "::MAX`] on overflow.")]
#[doc = concat!("Return [`", stringify!($Ty), "::MAX`] on overflow.")]
///
/// # Examples
///
Expand Down Expand Up @@ -1102,11 +1105,11 @@ macro_rules! nonzero_unsigned_signed_operations {
#[doc = sign_dependent_expr!{
$signedness ?
if signed {
concat!("Return [`", stringify!($Int), "::MIN`] ",
"or [`", stringify!($Int), "::MAX`] on overflow.")
concat!("Return [`", stringify!($Ty), "::MIN`] ",
"or [`", stringify!($Ty), "::MAX`] on overflow.")
}
if unsigned {
concat!("Return [`", stringify!($Int), "::MAX`] on overflow.")
concat!("Return [`", stringify!($Ty), "::MAX`] on overflow.")
}
}]
///
Expand Down
8 changes: 7 additions & 1 deletion library/std/src/os/unix/net/ancillary.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,13 @@ use crate::slice::from_raw_parts;
use crate::sys::net::Socket;

// FIXME(#43348): Make libc adapt #[doc(cfg(...))] so we don't need these fake definitions here?
#[cfg(all(doc, not(target_os = "linux"), not(target_os = "android"), not(target_os = "netbsd")))]
#[cfg(all(
doc,
not(target_os = "linux"),
not(target_os = "android"),
not(target_os = "netbsd"),
not(target_os = "freebsd")
))]
#[allow(non_camel_case_types)]
mod libc {
pub use libc::c_int;
Expand Down
Loading