Auto merge of #61789 - Centril:rollup-hhyvopq, r=Centril
Rollup of 9 pull requests Successful merges: - #60376 (Stabilize Option::xor) - #61398 (Stabilize copy_within) - #61629 (Hygienize macros in the standard library) - #61675 (Include frame pointer for bare metal RISC-V targets) - #61750 (Fix x.py install) - #61761 (Add an alias for x86_64-sun-solaris target tuple) - #61762 (rustbuild: fix libtest_stamp) - #61763 (ci: fix ci stats upload condition) - #61776 (Fix typos in error_codes) Failed merges: r? @ghost
This commit is contained in:
bors
commit
d8f50ab0ea
22 changed files with 67 additions and 68 deletions
|
|
@ -155,6 +155,6 @@ steps:
|
|||
- bash: aws s3 cp --acl public-read cpu-usage.csv s3://$DEPLOY_BUCKET/rustc-builds/$BUILD_SOURCEVERSION/cpu-$SYSTEM_JOBNAME.csv
|
||||
env:
|
||||
AWS_SECRET_ACCESS_KEY: $(AWS_SECRET_ACCESS_KEY)
|
||||
condition: contains(variables, 'AWS_SECRET_ACCESS_KEY')
|
||||
condition: variables['AWS_SECRET_ACCESS_KEY']
|
||||
continueOnError: true
|
||||
displayName: Upload CPU usage statistics
|
||||
|
|
|
|||
|
|
@ -787,7 +787,7 @@ impl<'a> Builder<'a> {
|
|||
|
||||
let libtest_stamp = match cmd {
|
||||
"check" | "clippy" | "fix" => check::libtest_stamp(self, cmp, target),
|
||||
_ => compile::libstd_stamp(self, cmp, target),
|
||||
_ => compile::libtest_stamp(self, cmp, target),
|
||||
};
|
||||
|
||||
let librustc_stamp = match cmd {
|
||||
|
|
|
|||
|
|
@ -251,7 +251,10 @@ install!((self, builder, _config),
|
|||
};
|
||||
Analysis, "analysis", Self::should_build(_config), only_hosts: false, {
|
||||
builder.ensure(dist::Analysis {
|
||||
compiler: self.compiler,
|
||||
// Find the actual compiler (handling the full bootstrap option) which
|
||||
// produced the save-analysis data because that data isn't copied
|
||||
// through the sysroot uplifting.
|
||||
compiler: builder.compiler_for(builder.top_stage, builder.config.build, self.target),
|
||||
target: self.target
|
||||
});
|
||||
install_analysis(builder, self.compiler.stage, self.target);
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ macro_rules! vec {
|
|||
($($x:expr),*) => (
|
||||
<[_]>::into_vec(box [$($x),*])
|
||||
);
|
||||
($($x:expr,)*) => (vec![$($x),*])
|
||||
($($x:expr,)*) => ($crate::vec![$($x),*])
|
||||
}
|
||||
|
||||
// HACK(japaric): with cfg(test) the inherent `[T]::into_vec` method, which is
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
#[stable(feature = "core", since = "1.6.0")]
|
||||
macro_rules! panic {
|
||||
() => (
|
||||
panic!("explicit panic")
|
||||
$crate::panic!("explicit panic")
|
||||
);
|
||||
($msg:expr) => ({
|
||||
$crate::panicking::panic(&($msg, file!(), line!(), __rust_unstable_column!()))
|
||||
});
|
||||
($msg:expr,) => (
|
||||
panic!($msg)
|
||||
$crate::panic!($msg)
|
||||
);
|
||||
($fmt:expr, $($arg:tt)+) => ({
|
||||
$crate::panicking::panic_fmt(format_args!($fmt, $($arg)*),
|
||||
|
|
@ -58,7 +58,7 @@ macro_rules! assert_eq {
|
|||
}
|
||||
});
|
||||
($left:expr, $right:expr,) => ({
|
||||
assert_eq!($left, $right)
|
||||
$crate::assert_eq!($left, $right)
|
||||
});
|
||||
($left:expr, $right:expr, $($arg:tt)+) => ({
|
||||
match (&($left), &($right)) {
|
||||
|
|
@ -115,7 +115,7 @@ macro_rules! assert_ne {
|
|||
}
|
||||
});
|
||||
($left:expr, $right:expr,) => {
|
||||
assert_ne!($left, $right)
|
||||
$crate::assert_ne!($left, $right)
|
||||
};
|
||||
($left:expr, $right:expr, $($arg:tt)+) => ({
|
||||
match (&($left), &($right)) {
|
||||
|
|
@ -208,7 +208,7 @@ macro_rules! debug_assert {
|
|||
#[macro_export]
|
||||
#[stable(feature = "rust1", since = "1.0.0")]
|
||||
macro_rules! debug_assert_eq {
|
||||
($($arg:tt)*) => (if cfg!(debug_assertions) { assert_eq!($($arg)*); })
|
||||
($($arg:tt)*) => (if cfg!(debug_assertions) { $crate::assert_eq!($($arg)*); })
|
||||
}
|
||||
|
||||
/// Asserts that two expressions are not equal to each other.
|
||||
|
|
@ -235,7 +235,7 @@ macro_rules! debug_assert_eq {
|
|||
#[macro_export]
|
||||
#[stable(feature = "assert_ne", since = "1.13.0")]
|
||||
macro_rules! debug_assert_ne {
|
||||
($($arg:tt)*) => (if cfg!(debug_assertions) { assert_ne!($($arg)*); })
|
||||
($($arg:tt)*) => (if cfg!(debug_assertions) { $crate::assert_ne!($($arg)*); })
|
||||
}
|
||||
|
||||
/// Unwraps a result or propagates its error.
|
||||
|
|
@ -310,7 +310,7 @@ macro_rules! r#try {
|
|||
return $crate::result::Result::Err($crate::convert::From::from(err))
|
||||
}
|
||||
});
|
||||
($expr:expr,) => (r#try!($expr));
|
||||
($expr:expr,) => ($crate::r#try!($expr));
|
||||
}
|
||||
|
||||
/// Writes formatted data into a buffer.
|
||||
|
|
@ -425,10 +425,10 @@ macro_rules! write {
|
|||
#[allow_internal_unstable(format_args_nl)]
|
||||
macro_rules! writeln {
|
||||
($dst:expr) => (
|
||||
write!($dst, "\n")
|
||||
$crate::write!($dst, "\n")
|
||||
);
|
||||
($dst:expr,) => (
|
||||
writeln!($dst)
|
||||
$crate::writeln!($dst)
|
||||
);
|
||||
($dst:expr, $($arg:tt)*) => (
|
||||
$dst.write_fmt(format_args_nl!($($arg)*))
|
||||
|
|
@ -494,10 +494,10 @@ macro_rules! unreachable {
|
|||
panic!("internal error: entered unreachable code")
|
||||
});
|
||||
($msg:expr) => ({
|
||||
unreachable!("{}", $msg)
|
||||
$crate::unreachable!("{}", $msg)
|
||||
});
|
||||
($msg:expr,) => ({
|
||||
unreachable!($msg)
|
||||
$crate::unreachable!($msg)
|
||||
});
|
||||
($fmt:expr, $($arg:tt)*) => ({
|
||||
panic!(concat!("internal error: entered unreachable code: ", $fmt), $($arg)*)
|
||||
|
|
|
|||
|
|
@ -725,8 +725,6 @@ impl<T> Option<T> {
|
|||
/// # Examples
|
||||
///
|
||||
/// ```
|
||||
/// #![feature(option_xor)]
|
||||
///
|
||||
/// let x = Some(2);
|
||||
/// let y: Option<u32> = None;
|
||||
/// assert_eq!(x.xor(y), Some(2));
|
||||
|
|
@ -744,7 +742,7 @@ impl<T> Option<T> {
|
|||
/// assert_eq!(x.xor(y), None);
|
||||
/// ```
|
||||
#[inline]
|
||||
#[unstable(feature = "option_xor", issue = "50512")]
|
||||
#[stable(feature = "option_xor", since = "1.37.0")]
|
||||
pub fn xor(self, optb: Option<T>) -> Option<T> {
|
||||
match (self, optb) {
|
||||
(Some(a), None) => Some(a),
|
||||
|
|
|
|||
|
|
@ -2146,14 +2146,13 @@ impl<T> [T] {
|
|||
/// Copying four bytes within a slice:
|
||||
///
|
||||
/// ```
|
||||
/// # #![feature(copy_within)]
|
||||
/// let mut bytes = *b"Hello, World!";
|
||||
///
|
||||
/// bytes.copy_within(1..5, 8);
|
||||
///
|
||||
/// assert_eq!(&bytes, b"Hello, Wello!");
|
||||
/// ```
|
||||
#[unstable(feature = "copy_within", issue = "54236")]
|
||||
#[stable(feature = "copy_within", since = "1.37.0")]
|
||||
pub fn copy_within<R: ops::RangeBounds<usize>>(&mut self, src: R, dest: usize)
|
||||
where
|
||||
T: Copy,
|
||||
|
|
@ -2178,8 +2177,8 @@ impl<T> [T] {
|
|||
assert!(dest <= self.len() - count, "dest is out of bounds");
|
||||
unsafe {
|
||||
ptr::copy(
|
||||
self.get_unchecked(src_start),
|
||||
self.get_unchecked_mut(dest),
|
||||
self.as_ptr().add(src_start),
|
||||
self.as_mut_ptr().add(dest),
|
||||
count,
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@
|
|||
#![feature(inner_deref)]
|
||||
#![feature(slice_internals)]
|
||||
#![feature(slice_partition_dedup)]
|
||||
#![feature(copy_within)]
|
||||
#![feature(int_error_matching)]
|
||||
#![feature(const_fn)]
|
||||
#![warn(rust_2018_idioms)]
|
||||
|
|
|
|||
|
|
@ -1512,6 +1512,13 @@ fn test_copy_within() {
|
|||
let mut bytes = *b"Hello, World!";
|
||||
bytes.copy_within(.., 0);
|
||||
assert_eq!(&bytes, b"Hello, World!");
|
||||
|
||||
// Ensure that copying at the end of slice won't cause UB.
|
||||
let mut bytes = *b"Hello, World!";
|
||||
bytes.copy_within(13..13, 5);
|
||||
assert_eq!(&bytes, b"Hello, World!");
|
||||
bytes.copy_within(5..5, 13);
|
||||
assert_eq!(&bytes, b"Hello, World!");
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
@ -1536,6 +1543,13 @@ fn test_copy_within_panics_src_inverted() {
|
|||
// 2 is greater than 1, so this range is invalid.
|
||||
bytes.copy_within(2..1, 0);
|
||||
}
|
||||
#[test]
|
||||
#[should_panic(expected = "attempted to index slice up to maximum usize")]
|
||||
fn test_copy_within_panics_src_out_of_bounds() {
|
||||
let mut bytes = *b"Hello, World!";
|
||||
// an inclusive range ending at usize::max_value() would make src_end overflow
|
||||
bytes.copy_within(usize::max_value()..=usize::max_value(), 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_is_sorted() {
|
||||
|
|
|
|||
|
|
@ -1883,7 +1883,7 @@ This pattern should be rewritten. There are a few possible ways to do this:
|
|||
# }
|
||||
```
|
||||
|
||||
The same applies to transmutes to `*mut fn()`, which were observedin practice.
|
||||
The same applies to transmutes to `*mut fn()`, which were observed in practice.
|
||||
Note though that use of this type is generally incorrect.
|
||||
The intention is typically to describe a function pointer, but just `fn()`
|
||||
alone suffices for that. `*mut fn()` is a pointer to a fn pointer.
|
||||
|
|
|
|||
|
|
@ -268,16 +268,16 @@ pub type LinkArgs = BTreeMap<LinkerFlavor, Vec<String>>;
|
|||
pub type TargetResult = Result<Target, String>;
|
||||
|
||||
macro_rules! supported_targets {
|
||||
( $(($triple:expr, $module:ident),)+ ) => (
|
||||
$(mod $module;)*
|
||||
( $(($( $triple:literal, )+ $module:ident ),)+ ) => {
|
||||
$(mod $module;)+
|
||||
|
||||
/// List of supported targets
|
||||
const TARGETS: &[&str] = &[$($triple),*];
|
||||
const TARGETS: &[&str] = &[$($($triple),+),+];
|
||||
|
||||
fn load_specific(target: &str) -> Result<Target, LoadTargetError> {
|
||||
match target {
|
||||
$(
|
||||
$triple => {
|
||||
$($triple)|+ => {
|
||||
let mut t = $module::target()
|
||||
.map_err(LoadTargetError::Other)?;
|
||||
t.options.is_builtin = true;
|
||||
|
|
@ -307,7 +307,7 @@ macro_rules! supported_targets {
|
|||
mod test_json_encode_decode {
|
||||
use serialize::json::ToJson;
|
||||
use super::Target;
|
||||
$(use super::$module;)*
|
||||
$(use super::$module;)+
|
||||
|
||||
$(
|
||||
#[test]
|
||||
|
|
@ -322,9 +322,9 @@ macro_rules! supported_targets {
|
|||
assert_eq!(original, parsed);
|
||||
});
|
||||
}
|
||||
)*
|
||||
)+
|
||||
}
|
||||
)
|
||||
};
|
||||
}
|
||||
|
||||
supported_targets! {
|
||||
|
|
@ -426,7 +426,9 @@ supported_targets! {
|
|||
("armv7r-none-eabi", armv7r_none_eabi),
|
||||
("armv7r-none-eabihf", armv7r_none_eabihf),
|
||||
|
||||
("x86_64-sun-solaris", x86_64_sun_solaris),
|
||||
// `x86_64-pc-solaris` is an alias for `x86_64_sun_solaris` for backwards compatibility reasons.
|
||||
// (See <https://github.com/rust-lang/rust/issues/40531>.)
|
||||
("x86_64-sun-solaris", "x86_64-pc-solaris", x86_64_sun_solaris),
|
||||
("sparcv9-sun-solaris", sparcv9_sun_solaris),
|
||||
|
||||
("x86_64-pc-windows-gnu", x86_64_pc_windows_gnu),
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ pub fn target() -> TargetResult {
|
|||
relocation_model: "static".to_string(),
|
||||
emit_debug_gdb_scripts: false,
|
||||
abi_blacklist: super::riscv_base::abi_blacklist(),
|
||||
eliminate_frame_pointer: false,
|
||||
.. Default::default()
|
||||
},
|
||||
})
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ pub fn target() -> TargetResult {
|
|||
relocation_model: "static".to_string(),
|
||||
emit_debug_gdb_scripts: false,
|
||||
abi_blacklist: super::riscv_base::abi_blacklist(),
|
||||
eliminate_frame_pointer: false,
|
||||
.. Default::default()
|
||||
},
|
||||
})
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ pub fn target() -> TargetResult {
|
|||
relocation_model: "static".to_string(),
|
||||
emit_debug_gdb_scripts: false,
|
||||
abi_blacklist: super::riscv_base::abi_blacklist(),
|
||||
eliminate_frame_pointer: false,
|
||||
.. Default::default()
|
||||
},
|
||||
})
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ pub fn target() -> TargetResult {
|
|||
relocation_model: "static".to_string(),
|
||||
emit_debug_gdb_scripts: false,
|
||||
abi_blacklist: super::riscv_base::abi_blacklist(),
|
||||
eliminate_frame_pointer: false,
|
||||
.. Default::default()
|
||||
},
|
||||
})
|
||||
|
|
|
|||
|
|
@ -56,13 +56,13 @@
|
|||
#[allow_internal_unstable(__rust_unstable_column, libstd_sys_internals)]
|
||||
macro_rules! panic {
|
||||
() => ({
|
||||
panic!("explicit panic")
|
||||
$crate::panic!("explicit panic")
|
||||
});
|
||||
($msg:expr) => ({
|
||||
$crate::rt::begin_panic($msg, &(file!(), line!(), __rust_unstable_column!()))
|
||||
});
|
||||
($msg:expr,) => ({
|
||||
panic!($msg)
|
||||
$crate::panic!($msg)
|
||||
});
|
||||
($fmt:expr, $($arg:tt)+) => ({
|
||||
$crate::rt::begin_panic_fmt(&format_args!($fmt, $($arg)+),
|
||||
|
|
@ -145,7 +145,7 @@ macro_rules! print {
|
|||
#[stable(feature = "rust1", since = "1.0.0")]
|
||||
#[allow_internal_unstable(print_internals, format_args_nl)]
|
||||
macro_rules! println {
|
||||
() => (print!("\n"));
|
||||
() => ($crate::print!("\n"));
|
||||
($($arg:tt)*) => ({
|
||||
$crate::io::_print(format_args_nl!($($arg)*));
|
||||
})
|
||||
|
|
@ -204,7 +204,7 @@ macro_rules! eprint {
|
|||
#[stable(feature = "eprint", since = "1.19.0")]
|
||||
#[allow_internal_unstable(print_internals, format_args_nl)]
|
||||
macro_rules! eprintln {
|
||||
() => (eprint!("\n"));
|
||||
() => ($crate::eprint!("\n"));
|
||||
($($arg:tt)*) => ({
|
||||
$crate::io::_eprint(format_args_nl!($($arg)*));
|
||||
})
|
||||
|
|
@ -337,23 +337,23 @@ macro_rules! eprintln {
|
|||
#[stable(feature = "dbg_macro", since = "1.32.0")]
|
||||
macro_rules! dbg {
|
||||
() => {
|
||||
eprintln!("[{}:{}]", file!(), line!());
|
||||
$crate::eprintln!("[{}:{}]", file!(), line!());
|
||||
};
|
||||
($val:expr) => {
|
||||
// Use of `match` here is intentional because it affects the lifetimes
|
||||
// of temporaries - https://stackoverflow.com/a/48732525/1063961
|
||||
match $val {
|
||||
tmp => {
|
||||
eprintln!("[{}:{}] {} = {:#?}",
|
||||
$crate::eprintln!("[{}:{}] {} = {:#?}",
|
||||
file!(), line!(), stringify!($val), &tmp);
|
||||
tmp
|
||||
}
|
||||
}
|
||||
};
|
||||
// Trailing comma with single argument is ignored
|
||||
($val:expr,) => { dbg!($val) };
|
||||
($val:expr,) => { $crate::dbg!($val) };
|
||||
($($val:expr),+ $(,)?) => {
|
||||
($(dbg!($val)),+,)
|
||||
($($crate::dbg!($val)),+,)
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ This pattern should be rewritten. There are a few possible ways to do this:
|
|||
let f: extern "C" fn(*mut i32) = transmute(foo as usize); // works too
|
||||
```
|
||||
|
||||
The same applies to transmutes to `*mut fn()`, which were observedin practice.
|
||||
The same applies to transmutes to `*mut fn()`, which were observed in practice.
|
||||
Note though that use of this type is generally incorrect.
|
||||
The intention is typically to describe a function pointer, but just `fn()`
|
||||
alone suffices for that. `*mut fn()` is a pointer to a fn pointer.
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ mod bar {
|
|||
}
|
||||
fn f() {
|
||||
::foo::m!();
|
||||
println!(); //~ ERROR cannot find macro `print!` in this scope
|
||||
assert_eq!(0, 0); //~ ERROR cannot find macro `panic!` in this scope
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@ LL | fn f() { ::bar::m!(); }
|
|||
LL | Vec::new();
|
||||
| ^^^ use of undeclared type or module `Vec`
|
||||
|
||||
error: cannot find macro `print!` in this scope
|
||||
error: cannot find macro `panic!` in this scope
|
||||
--> $DIR/no_implicit_prelude.rs:16:9
|
||||
|
|
||||
LL | println!();
|
||||
| ^^^^^^^^^^^
|
||||
LL | assert_eq!(0, 0);
|
||||
| ^^^^^^^^^^^^^^^^^
|
||||
|
|
||||
= help: have you added the `#[macro_use]` on the module/import?
|
||||
= note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ mod inner2 {
|
|||
|
||||
fn main() {
|
||||
panic!(); //~ ERROR `panic` is ambiguous
|
||||
//~| ERROR `panic` is ambiguous
|
||||
}
|
||||
|
||||
mod inner3 {
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ LL | use inner1::*;
|
|||
= help: consider adding an explicit import of `exported` to disambiguate
|
||||
|
||||
error[E0659]: `include` is ambiguous (macro-expanded name vs less macro-expanded name from outer scope during import/macro resolution)
|
||||
--> $DIR/local-modularized-tricky-fail-1.rs:47:1
|
||||
--> $DIR/local-modularized-tricky-fail-1.rs:46:1
|
||||
|
|
||||
LL | include!();
|
||||
| ^^^^^^^ ambiguous name
|
||||
|
|
@ -59,26 +59,6 @@ LL | define_panic!();
|
|||
| ---------------- in this macro invocation
|
||||
= help: use `crate::panic` to refer to this macro unambiguously
|
||||
|
||||
error[E0659]: `panic` is ambiguous (macro-expanded name vs less macro-expanded name from outer scope during import/macro resolution)
|
||||
--> $DIR/local-modularized-tricky-fail-1.rs:35:5
|
||||
|
|
||||
LL | panic!();
|
||||
| ^^^^^^^^^ ambiguous name
|
||||
|
|
||||
= note: `panic` could refer to a macro from prelude
|
||||
note: `panic` could also refer to the macro defined here
|
||||
--> $DIR/local-modularized-tricky-fail-1.rs:11:5
|
||||
|
|
||||
LL | / macro_rules! panic {
|
||||
LL | | () => ()
|
||||
LL | | }
|
||||
| |_____^
|
||||
...
|
||||
LL | define_panic!();
|
||||
| ---------------- in this macro invocation
|
||||
= help: use `crate::panic` to refer to this macro unambiguously
|
||||
= note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
|
||||
|
||||
error: aborting due to 4 previous errors
|
||||
error: aborting due to 3 previous errors
|
||||
|
||||
For more information about this error, try `rustc --explain E0659`.
|
||||
|
|
|
|||
|
|
@ -118,6 +118,7 @@ static TARGETS: &[&str] = &[
|
|||
"x86_64-pc-windows-msvc",
|
||||
"x86_64-rumprun-netbsd",
|
||||
"x86_64-sun-solaris",
|
||||
"x86_64-pc-solaris",
|
||||
"x86_64-unknown-cloudabi",
|
||||
"x86_64-unknown-freebsd",
|
||||
"x86_64-unknown-linux-gnu",
|
||||
|
|
|
|||
Loading…
Reference in a new issue