Auto merge of #90695 - GuillaumeGomez:rollup-kxvvw4o, r=GuillaumeGomez
Rollup of 4 pull requests Successful merges: - #90494 (ARMv6K Horizon OS panic change) - #90652 (use filter(|x| matches!(..)) instead of filter_map(|x| match x ... => Some(xy))) - #90657 (Fix bug with `#[doc]` string single-character last lines) - #90689 (⬆️ rust-analyzer) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
This commit is contained in:
commit
c57704f3eb
8 changed files with 25 additions and 29 deletions
|
@ -38,7 +38,7 @@ pub fn beautify_doc_string(data: Symbol) -> Symbol {
|
|||
i += 1;
|
||||
}
|
||||
// like the first, a last line of all stars should be omitted
|
||||
if j > i && lines[j - 1].chars().skip(1).all(|c| c == '*') {
|
||||
if j > i && !lines[j - 1].is_empty() && lines[j - 1].chars().all(|c| c == '*') {
|
||||
j -= 1;
|
||||
}
|
||||
|
||||
|
|
|
@ -887,10 +887,7 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
|
|||
let (lifetimes, binders): (FxIndexMap<hir::ParamName, Region>, Vec<_>) = c
|
||||
.generic_params
|
||||
.iter()
|
||||
.filter_map(|param| match param.kind {
|
||||
GenericParamKind::Lifetime { .. } => Some(param),
|
||||
_ => None,
|
||||
})
|
||||
.filter(|param| matches!(param.kind, GenericParamKind::Lifetime { .. }))
|
||||
.enumerate()
|
||||
.map(|(late_bound_idx, param)| {
|
||||
let pair = Region::late(late_bound_idx as u32, &self.tcx.hir(), param);
|
||||
|
@ -1370,9 +1367,8 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
|
|||
let (lifetimes, binders): (FxIndexMap<hir::ParamName, Region>, Vec<_>) =
|
||||
bound_generic_params
|
||||
.iter()
|
||||
.filter_map(|param| match param.kind {
|
||||
GenericParamKind::Lifetime { .. } => Some(param),
|
||||
_ => None,
|
||||
.filter(|param| {
|
||||
matches!(param.kind, GenericParamKind::Lifetime { .. })
|
||||
})
|
||||
.enumerate()
|
||||
.map(|(late_bound_idx, param)| {
|
||||
|
@ -1469,10 +1465,7 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
|
|||
let binders_iter = trait_ref
|
||||
.bound_generic_params
|
||||
.iter()
|
||||
.filter_map(|param| match param.kind {
|
||||
GenericParamKind::Lifetime { .. } => Some(param),
|
||||
_ => None,
|
||||
})
|
||||
.filter(|param| matches!(param.kind, GenericParamKind::Lifetime { .. }))
|
||||
.enumerate()
|
||||
.map(|(late_bound_idx, param)| {
|
||||
let pair = Region::late(
|
||||
|
@ -2235,19 +2228,14 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
|
|||
let binders: Vec<_> = generics
|
||||
.params
|
||||
.iter()
|
||||
.filter_map(|param| match param.kind {
|
||||
GenericParamKind::Lifetime { .. }
|
||||
if self.map.late_bound.contains(¶m.hir_id) =>
|
||||
{
|
||||
Some(param)
|
||||
}
|
||||
_ => None,
|
||||
.filter(|param| {
|
||||
matches!(param.kind, GenericParamKind::Lifetime { .. })
|
||||
&& self.map.late_bound.contains(¶m.hir_id)
|
||||
})
|
||||
.enumerate()
|
||||
.map(|(late_bound_idx, param)| {
|
||||
let pair = Region::late(late_bound_idx as u32, &self.tcx.hir(), param);
|
||||
let r = late_region_as_bound_region(self.tcx, &pair.1);
|
||||
r
|
||||
late_region_as_bound_region(self.tcx, &pair.1)
|
||||
})
|
||||
.collect();
|
||||
self.map.late_bound_vars.insert(hir_id, binders);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
use crate::spec::{LinkArgs, LinkerFlavor, PanicStrategy, RelocModel, Target, TargetOptions};
|
||||
use crate::spec::{LinkArgs, LinkerFlavor, RelocModel, Target, TargetOptions};
|
||||
|
||||
/// A base target for Nintendo 3DS devices using the devkitARM toolchain.
|
||||
///
|
||||
|
@ -36,7 +36,6 @@ pub fn target() -> Target {
|
|||
features: "+vfp2".to_string(),
|
||||
pre_link_args,
|
||||
exe_suffix: ".elf".to_string(),
|
||||
panic_strategy: PanicStrategy::Abort,
|
||||
..Default::default()
|
||||
},
|
||||
}
|
||||
|
|
|
@ -180,14 +180,14 @@ fn visit_implementation_of_dispatch_from_dyn(tcx: TyCtxt<'_>, impl_did: LocalDef
|
|||
|
||||
let coerced_fields = fields
|
||||
.iter()
|
||||
.filter_map(|field| {
|
||||
.filter(|field| {
|
||||
let ty_a = field.ty(tcx, substs_a);
|
||||
let ty_b = field.ty(tcx, substs_b);
|
||||
|
||||
if let Ok(layout) = tcx.layout_of(param_env.and(ty_a)) {
|
||||
if layout.is_zst() && layout.align.abi.bytes() == 1 {
|
||||
// ignore ZST fields with alignment of 1 byte
|
||||
return None;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -204,11 +204,11 @@ fn visit_implementation_of_dispatch_from_dyn(tcx: TyCtxt<'_>, impl_did: LocalDef
|
|||
))
|
||||
.emit();
|
||||
|
||||
return None;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
Some(field)
|
||||
return true;
|
||||
})
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 7f14f76c8ba6945c052fab77022e6e768b58e0b4
|
||||
Subproject commit b02ed04a7e915659eea6fb1607df469b84a30638
|
7
src/test/rustdoc/include_str_cut.rs
Normal file
7
src/test/rustdoc/include_str_cut.rs
Normal file
|
@ -0,0 +1,7 @@
|
|||
#![crate_name = "foo"]
|
||||
#![no_std]
|
||||
|
||||
// @has 'foo/fn.foo.html'
|
||||
// @has - '//*[@class="docblock"]' 'inc2 x'
|
||||
#[doc = include_str!("short-line.md")]
|
||||
pub fn foo() {}
|
2
src/test/rustdoc/short-line.md
Normal file
2
src/test/rustdoc/short-line.md
Normal file
|
@ -0,0 +1,2 @@
|
|||
inc2
|
||||
x
|
|
@ -1 +1 @@
|
|||
Subproject commit 04f03a360ab8fef3d9c0ff84de2d39b8a196c717
|
||||
Subproject commit 2c0f433fd2e838ae181f87019b6f1fefe33c6f54
|
Loading…
Reference in a new issue