Skip to content

Commit c08b235

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

File tree

5 files changed

+11
-6
lines changed

5 files changed

+11
-6
lines changed

compiler/rustc_codegen_llvm/src/back/write.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ pub(crate) unsafe fn optimize_with_new_llvm_pass_manager(
463463
let llvm_selfprofiler =
464464
llvm_profiler.as_mut().map(|s| s as *mut _ as *mut c_void).unwrap_or(std::ptr::null_mut());
465465

466-
let extra_passes = config.passes.join(",");
466+
let extra_passes = if !is_lto { config.passes.join(",") } else { "".to_string() };
467467

468468
let llvm_plugins = config.llvm_plugins.join(",");
469469

compiler/rustc_hir/src/hir.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1885,7 +1885,7 @@ pub enum ExprKind<'hir> {
18851885
/// To resolve the called method to a `DefId`, call [`type_dependent_def_id`] with
18861886
/// the `hir_id` of the `MethodCall` node itself.
18871887
///
1888-
/// [`type_dependent_def_id`]: ../ty/struct.TypeckResults.html#method.type_dependent_def_id
1888+
/// [`type_dependent_def_id`]: ../../rustc_middle/ty/struct.TypeckResults.html#method.type_dependent_def_id
18891889
MethodCall(&'hir PathSegment<'hir>, &'hir [Expr<'hir>], Span),
18901890
/// A tuple (e.g., `(a, b, c, d)`).
18911891
Tup(&'hir [Expr<'hir>]),
@@ -1982,7 +1982,7 @@ pub enum ExprKind<'hir> {
19821982
///
19831983
/// To resolve the path to a `DefId`, call [`qpath_res`].
19841984
///
1985-
/// [`qpath_res`]: ../rustc_middle/ty/struct.TypeckResults.html#method.qpath_res
1985+
/// [`qpath_res`]: ../../rustc_middle/ty/struct.TypeckResults.html#method.qpath_res
19861986
#[derive(Debug, HashStable_Generic)]
19871987
pub enum QPath<'hir> {
19881988
/// Path to a definition, optionally "fully-qualified" with a `Self`

library/core/src/cmp.rs

+1-1
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),

library/core/src/macros/mod.rs

+2-2
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")))]

src/librustdoc/html/static/.eslintrc.js

+5
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,10 @@ module.exports = {
8484
"no-implicit-globals": "error",
8585
"no-implied-eval": "error",
8686
"no-label-var": "error",
87+
"no-lonely-if": "error",
88+
"no-mixed-operators": "error",
89+
"no-multi-assign": "error",
90+
"no-return-assign": "error",
91+
"no-script-url": "error",
8792
}
8893
};

0 commit comments

Comments
 (0)