Skip to content

Commit 2e8f6b2

Browse files
committed
Auto merge of rust-lang#97996 - matthiaskrgr:rollup-bvbjlid, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - rust-lang#97904 (Small grammar fix in the compile_error documentation) - rust-lang#97943 (line 1352, change `self` to `*self`, other to `*other`) - rust-lang#97969 (Make -Cpasses= only apply to pre-link optimization) - rust-lang#97990 (Add more eslint checks) - rust-lang#97994 (feat(fix): update some links in `hir.rs`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 5f8f2f4 + ee8ec71 commit 2e8f6b2

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

core/src/cmp.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1349,7 +1349,7 @@ mod impls {
13491349
impl PartialOrd for $t {
13501350
#[inline]
13511351
fn partial_cmp(&self, other: &$t) -> Option<Ordering> {
1352-
match (self <= other, self >= other) {
1352+
match (*self <= *other, *self >= *other) {
13531353
(false, false) => None,
13541354
(false, true) => Some(Greater),
13551355
(true, false) => Some(Less),

core/src/macros/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,7 @@ pub(crate) mod builtin {
795795
///
796796
/// Two such examples are macros and `#[cfg]` environments.
797797
///
798-
/// Emit better compiler error if a macro is passed invalid values. Without the final branch,
798+
/// Emit a better compiler error if a macro is passed invalid values. Without the final branch,
799799
/// the compiler would still emit an error, but the error's message would not mention the two
800800
/// valid values.
801801
///
@@ -812,7 +812,7 @@ pub(crate) mod builtin {
812812
/// // ^ will fail at compile time with message "This macro only accepts `foo` or `bar`"
813813
/// ```
814814
///
815-
/// Emit compiler error if one of a number of features isn't available.
815+
/// Emit a compiler error if one of a number of features isn't available.
816816
///
817817
/// ```compile_fail
818818
/// #[cfg(not(any(feature = "foo", feature = "bar")))]

0 commit comments

Comments
 (0)