diff --git a/compiler/rustc_ast_lowering/src/asm.rs b/compiler/rustc_ast_lowering/src/asm.rs
index de0874af934cf..666e7763e6276 100644
--- a/compiler/rustc_ast_lowering/src/asm.rs
+++ b/compiler/rustc_ast_lowering/src/asm.rs
@@ -187,7 +187,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
.emit();
}
hir::InlineAsmOperand::Const {
- anon_const: self.lower_anon_const_to_anon_const(anon_const),
+ anon_const: self.lower_anon_const(anon_const),
}
}
InlineAsmOperand::Sym { sym } => {
@@ -222,21 +222,18 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
};
// Wrap the expression in an AnonConst.
- let parent_def_id = self.current_def_id_parent;
+ let parent_def_id = self.current_hir_id_owner;
let node_id = self.next_node_id();
- // HACK(min_generic_const_args): see lower_anon_const
- if !expr.is_potential_trivial_const_arg() {
- self.create_def(
- parent_def_id,
- node_id,
- kw::Empty,
- DefKind::AnonConst,
- *op_sp,
- );
- }
+ self.create_def(
+ parent_def_id.def_id,
+ node_id,
+ kw::Empty,
+ DefKind::AnonConst,
+ *op_sp,
+ );
let anon_const = AnonConst { id: node_id, value: P(expr) };
hir::InlineAsmOperand::SymFn {
- anon_const: self.lower_anon_const_to_anon_const(&anon_const),
+ anon_const: self.lower_anon_const(&anon_const),
}
}
}
diff --git a/compiler/rustc_ast_lowering/src/expr.rs b/compiler/rustc_ast_lowering/src/expr.rs
index d870f9fe0aef2..218fa9740229d 100644
--- a/compiler/rustc_ast_lowering/src/expr.rs
+++ b/compiler/rustc_ast_lowering/src/expr.rs
@@ -75,15 +75,10 @@ impl<'hir> LoweringContext<'_, 'hir> {
let kind = match &e.kind {
ExprKind::Array(exprs) => hir::ExprKind::Array(self.lower_exprs(exprs)),
ExprKind::ConstBlock(c) => {
- let c = self.with_new_scopes(c.value.span, |this| {
- let def_id = this.local_def_id(c.id);
- hir::ConstBlock {
- def_id,
- hir_id: this.lower_node_id(c.id),
- body: this.with_def_id_parent(def_id, |this| {
- this.lower_const_body(c.value.span, Some(&c.value))
- }),
- }
+ let c = self.with_new_scopes(c.value.span, |this| hir::ConstBlock {
+ def_id: this.local_def_id(c.id),
+ hir_id: this.lower_node_id(c.id),
+ body: this.lower_const_body(c.value.span, Some(&c.value)),
});
hir::ExprKind::ConstBlock(c)
}
@@ -382,14 +377,17 @@ impl<'hir> LoweringContext<'_, 'hir> {
let mut generic_args = ThinVec::new();
for (idx, arg) in args.into_iter().enumerate() {
if legacy_args_idx.contains(&idx) {
- let parent_def_id = self.current_def_id_parent;
+ let parent_def_id = self.current_hir_id_owner;
let node_id = self.next_node_id();
- // HACK(min_generic_const_args): see lower_anon_const
- if !arg.is_potential_trivial_const_arg() {
- // Add a definition for the in-band const def.
- self.create_def(parent_def_id, node_id, kw::Empty, DefKind::AnonConst, f.span);
- }
+ // Add a definition for the in-band const def.
+ self.create_def(
+ parent_def_id.def_id,
+ node_id,
+ kw::Empty,
+ DefKind::AnonConst,
+ f.span,
+ );
let anon_const = AnonConst { id: node_id, value: arg };
generic_args.push(AngleBracketedArg::Arg(GenericArg::Const(anon_const)));
@@ -624,7 +622,6 @@ impl<'hir> LoweringContext<'_, 'hir> {
coroutine_source: hir::CoroutineSource,
body: impl FnOnce(&mut Self) -> hir::Expr<'hir>,
) -> hir::ExprKind<'hir> {
- let closure_def_id = self.local_def_id(closure_node_id);
let coroutine_kind = hir::CoroutineKind::Desugared(desugaring_kind, coroutine_source);
// The `async` desugaring takes a resume argument and maintains a `task_context`,
@@ -675,24 +672,22 @@ impl<'hir> LoweringContext<'_, 'hir> {
lifetime_elision_allowed: false,
});
- let body = self.with_def_id_parent(closure_def_id, move |this| {
- this.lower_body(move |this| {
- this.coroutine_kind = Some(coroutine_kind);
+ let body = self.lower_body(move |this| {
+ this.coroutine_kind = Some(coroutine_kind);
- let old_ctx = this.task_context;
- if task_context.is_some() {
- this.task_context = task_context;
- }
- let res = body(this);
- this.task_context = old_ctx;
+ let old_ctx = this.task_context;
+ if task_context.is_some() {
+ this.task_context = task_context;
+ }
+ let res = body(this);
+ this.task_context = old_ctx;
- (params, res)
- })
+ (params, res)
});
// `static |<_task_context?>| -> <return_ty> { <body> }`:
hir::ExprKind::Closure(self.arena.alloc(hir::Closure {
- def_id: closure_def_id,
+ def_id: self.local_def_id(closure_node_id),
binder: hir::ClosureBinder::Default,
capture_clause,
bound_generic_params: &[],
@@ -971,30 +966,27 @@ impl<'hir> LoweringContext<'_, 'hir> {
fn_decl_span: Span,
fn_arg_span: Span,
) -> hir::ExprKind<'hir> {
- let closure_def_id = self.local_def_id(closure_id);
let (binder_clause, generic_params) = self.lower_closure_binder(binder);
let (body_id, closure_kind) = self.with_new_scopes(fn_decl_span, move |this| {
- this.with_def_id_parent(closure_def_id, move |this| {
- let mut coroutine_kind = if this
- .attrs
- .get(&closure_hir_id.local_id)
- .is_some_and(|attrs| attrs.iter().any(|attr| attr.has_name(sym::coroutine)))
- {
- Some(hir::CoroutineKind::Coroutine(Movability::Movable))
- } else {
- None
- };
- let body_id = this.lower_fn_body(decl, |this| {
- this.coroutine_kind = coroutine_kind;
- let e = this.lower_expr_mut(body);
- coroutine_kind = this.coroutine_kind;
- e
- });
- let coroutine_option =
- this.closure_movability_for_fn(decl, fn_decl_span, coroutine_kind, movability);
- (body_id, coroutine_option)
- })
+ let mut coroutine_kind = if this
+ .attrs
+ .get(&closure_hir_id.local_id)
+ .is_some_and(|attrs| attrs.iter().any(|attr| attr.has_name(sym::coroutine)))
+ {
+ Some(hir::CoroutineKind::Coroutine(Movability::Movable))
+ } else {
+ None
+ };
+ let body_id = this.lower_fn_body(decl, |this| {
+ this.coroutine_kind = coroutine_kind;
+ let e = this.lower_expr_mut(body);
+ coroutine_kind = this.coroutine_kind;
+ e
+ });
+ let coroutine_option =
+ this.closure_movability_for_fn(decl, fn_decl_span, coroutine_kind, movability);
+ (body_id, coroutine_option)
});
let bound_generic_params = self.lower_lifetime_binder(closure_id, generic_params);
@@ -1002,7 +994,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
let fn_decl = self.lower_fn_decl(decl, closure_id, fn_decl_span, FnDeclKind::Closure, None);
let c = self.arena.alloc(hir::Closure {
- def_id: closure_def_id,
+ def_id: self.local_def_id(closure_id),
binder: binder_clause,
capture_clause,
bound_generic_params,
@@ -1074,7 +1066,6 @@ impl<'hir> LoweringContext<'_, 'hir> {
fn_decl_span: Span,
fn_arg_span: Span,
) -> hir::ExprKind<'hir> {
- let closure_def_id = self.local_def_id(closure_id);
let (binder_clause, generic_params) = self.lower_closure_binder(binder);
assert_matches!(
@@ -1084,29 +1075,27 @@ impl<'hir> LoweringContext<'_, 'hir> {
);
let body = self.with_new_scopes(fn_decl_span, |this| {
- this.with_def_id_parent(closure_def_id, |this| {
- let inner_decl =
- FnDecl { inputs: decl.inputs.clone(), output: FnRetTy::Default(fn_decl_span) };
-
- // Transform `async |x: u8| -> X { ... }` into
- // `|x: u8| || -> X { ... }`.
- let body_id = this.lower_body(|this| {
- let (parameters, expr) = this.lower_coroutine_body_with_moved_arguments(
- &inner_decl,
- |this| this.with_new_scopes(fn_decl_span, |this| this.lower_expr_mut(body)),
- fn_decl_span,
- body.span,
- coroutine_kind,
- hir::CoroutineSource::Closure,
- );
+ let inner_decl =
+ FnDecl { inputs: decl.inputs.clone(), output: FnRetTy::Default(fn_decl_span) };
+
+ // Transform `async |x: u8| -> X { ... }` into
+ // `|x: u8| || -> X { ... }`.
+ let body_id = this.lower_body(|this| {
+ let (parameters, expr) = this.lower_coroutine_body_with_moved_arguments(
+ &inner_decl,
+ |this| this.with_new_scopes(fn_decl_span, |this| this.lower_expr_mut(body)),
+ fn_decl_span,
+ body.span,
+ coroutine_kind,
+ hir::CoroutineSource::Closure,
+ );
- let hir_id = this.lower_node_id(coroutine_kind.closure_id());
- this.maybe_forward_track_caller(body.span, closure_hir_id, hir_id);
+ let hir_id = this.lower_node_id(coroutine_kind.closure_id());
+ this.maybe_forward_track_caller(body.span, closure_hir_id, hir_id);
- (parameters, expr)
- });
- body_id
- })
+ (parameters, expr)
+ });
+ body_id
});
let bound_generic_params = self.lower_lifetime_binder(closure_id, generic_params);
@@ -1117,7 +1106,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
self.lower_fn_decl(&decl, closure_id, fn_decl_span, FnDeclKind::Closure, None);
let c = self.arena.alloc(hir::Closure {
- def_id: closure_def_id,
+ def_id: self.local_def_id(closure_id),
binder: binder_clause,
capture_clause,
bound_generic_params,
diff --git a/compiler/rustc_ast_lowering/src/index.rs b/compiler/rustc_ast_lowering/src/index.rs
index 23729124e21a9..44f37b5533a67 100644
--- a/compiler/rustc_ast_lowering/src/index.rs
+++ b/compiler/rustc_ast_lowering/src/index.rs
@@ -181,7 +181,7 @@ impl<'a, 'hir> Visitor<'hir> for NodeCollector<'a, 'hir> {
intravisit::walk_generic_param(self, param);
}
- fn visit_const_param_default(&mut self, param: HirId, ct: &'hir ConstArg<'hir>) {
+ fn visit_const_param_default(&mut self, param: HirId, ct: &'hir AnonConst) {
self.with_parent(param, |this| {
intravisit::walk_const_param_default(this, ct);
})
@@ -229,7 +229,6 @@ impl<'a, 'hir> Visitor<'hir> for NodeCollector<'a, 'hir> {
}
fn visit_anon_const(&mut self, constant: &'hir AnonConst) {
- // FIXME: use real span?
self.insert(DUMMY_SP, constant.hir_id, Node::AnonConst(constant));
self.with_parent(constant.hir_id, |this| {
@@ -245,15 +244,6 @@ impl<'a, 'hir> Visitor<'hir> for NodeCollector<'a, 'hir> {
});
}
- fn visit_const_arg(&mut self, const_arg: &'hir ConstArg<'hir>) {
- // FIXME: use real span?
- self.insert(DUMMY_SP, const_arg.hir_id, Node::ConstArg(const_arg));
-
- self.with_parent(const_arg.hir_id, |this| {
- intravisit::walk_const_arg(this, const_arg);
- });
- }
-
fn visit_expr(&mut self, expr: &'hir Expr<'hir>) {
self.insert(expr.span, expr.hir_id, Node::Expr(expr));
diff --git a/compiler/rustc_ast_lowering/src/item.rs b/compiler/rustc_ast_lowering/src/item.rs
index f990b4ba69b3f..0ad23b5356690 100644
--- a/compiler/rustc_ast_lowering/src/item.rs
+++ b/compiler/rustc_ast_lowering/src/item.rs
@@ -61,10 +61,7 @@ impl<'a, 'hir> ItemLowerer<'a, 'hir> {
for (def_id, info) in lctx.children {
let owner = self.owners.ensure_contains_elem(def_id, || hir::MaybeOwner::Phantom);
- debug_assert!(
- matches!(owner, hir::MaybeOwner::Phantom),
- "duplicate copy of {def_id:?} in lctx.children"
- );
+ debug_assert!(matches!(owner, hir::MaybeOwner::Phantom));
*owner = info;
}
}
@@ -716,7 +713,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
hir_id,
def_id: self.local_def_id(v.id),
data: self.lower_variant_data(hir_id, &v.data),
- disr_expr: v.disr_expr.as_ref().map(|e| self.lower_anon_const_to_anon_const(e)),
+ disr_expr: v.disr_expr.as_ref().map(|e| self.lower_anon_const(e)),
ident: self.lower_ident(v.ident),
span: self.lower_span(v.span),
}
@@ -1604,7 +1601,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
if let Some((span, hir_id, def_id)) = host_param_parts {
let const_node_id = self.next_node_id();
- let anon_const_did =
+ let anon_const =
self.create_def(def_id, const_node_id, kw::Empty, DefKind::AnonConst, span);
let const_id = self.next_id();
@@ -1612,7 +1609,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
let bool_id = self.next_id();
self.children.push((def_id, hir::MaybeOwner::NonOwner(hir_id)));
- self.children.push((anon_const_did, hir::MaybeOwner::NonOwner(const_id)));
+ self.children.push((anon_const, hir::MaybeOwner::NonOwner(const_id)));
let const_body = self.lower_body(|this| {
(
@@ -1627,17 +1624,6 @@ impl<'hir> LoweringContext<'_, 'hir> {
)
});
- let default_ac = self.arena.alloc(hir::AnonConst {
- def_id: anon_const_did,
- hir_id: const_id,
- body: const_body,
- span,
- });
- let default_ct = self.arena.alloc(hir::ConstArg {
- hir_id: self.next_id(),
- kind: hir::ConstArgKind::Anon(default_ac),
- is_desugared_from_effects: false,
- });
let param = hir::GenericParam {
def_id,
hir_id,
@@ -1662,7 +1648,12 @@ impl<'hir> LoweringContext<'_, 'hir> {
)),
)),
// FIXME(effects) we might not need a default.
- default: Some(default_ct),
+ default: Some(self.arena.alloc(hir::AnonConst {
+ def_id: anon_const,
+ hir_id: const_id,
+ body: const_body,
+ span,
+ })),
is_host_effect: true,
synthetic: true,
},
diff --git a/compiler/rustc_ast_lowering/src/lib.rs b/compiler/rustc_ast_lowering/src/lib.rs
index 0f5f4d8023bd1..24748d2d00968 100644
--- a/compiler/rustc_ast_lowering/src/lib.rs
+++ b/compiler/rustc_ast_lowering/src/lib.rs
@@ -120,18 +120,6 @@ struct LoweringContext<'a, 'hir> {
is_in_dyn_type: bool,
current_hir_id_owner: hir::OwnerId,
- /// Why do we need this in addition to [`Self::current_hir_id_owner`]?
- ///
- /// Currently (as of June 2024), anonymous constants are not HIR owners; however,
- /// they do get their own DefIds. Some of these DefIds have to be created during
- /// AST lowering, rather than def collection, because we can't tell until after
- /// name resolution whether an anonymous constant will end up instead being a
- /// [`hir::ConstArgKind::Path`]. However, to compute which generics are
- /// available to an anonymous constant nested inside another, we need to make
- /// sure that the parent is recorded as the parent anon const, not the enclosing
- /// item. So we need to track parent defs differently from HIR owners, since they
- /// will be finer-grained in the case of anon consts.
- current_def_id_parent: LocalDefId,
item_local_id_counter: hir::ItemLocalId,
trait_map: ItemLocalMap<Box<[TraitCandidate]>>,
@@ -174,7 +162,6 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
attrs: SortedMap::default(),
children: Vec::default(),
current_hir_id_owner: hir::CRATE_OWNER_ID,
- current_def_id_parent: CRATE_DEF_ID,
item_local_id_counter: hir::ItemLocalId::ZERO,
node_id_to_local_id: Default::default(),
trait_map: Default::default(),
@@ -605,7 +592,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
let _old = self.node_id_to_local_id.insert(owner, hir::ItemLocalId::ZERO);
debug_assert_eq!(_old, None);
- let item = self.with_def_id_parent(def_id, f);
+ let item = f(self);
debug_assert_eq!(def_id, item.def_id().def_id);
// `f` should have consumed all the elements in these vectors when constructing `item`.
debug_assert!(self.impl_trait_defs.is_empty());
@@ -625,13 +612,6 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
self.children.push((def_id, hir::MaybeOwner::Owner(info)));
}
- fn with_def_id_parent<T>(&mut self, parent: LocalDefId, f: impl FnOnce(&mut Self) -> T) -> T {
- let current_def_id_parent = std::mem::replace(&mut self.current_def_id_parent, parent);
- let result = f(self);
- self.current_def_id_parent = current_def_id_parent;
- result
- }
-
/// Installs the remapping `remap` in scope while `f` is being executed.
/// This causes references to the `LocalDefId` keys to be changed to
/// refer to the values instead.
@@ -826,7 +806,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
LifetimeRes::Fresh { param, kind, .. } => {
// Late resolution delegates to us the creation of the `LocalDefId`.
let _def_id = self.create_def(
- self.current_hir_id_owner.def_id, // FIXME: should this use self.current_def_id_parent?
+ self.current_hir_id_owner.def_id,
param,
kw::UnderscoreLifetime,
DefKind::LifetimeParam,
@@ -1064,7 +1044,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
AssocItemConstraintKind::Equality { term } => {
let term = match term {
Term::Ty(ty) => self.lower_ty(ty, itctx).into(),
- Term::Const(c) => self.lower_anon_const_to_const_arg(c).into(),
+ Term::Const(c) => self.lower_anon_const(c).into(),
};
hir::AssocItemConstraintKind::Equality { term }
}
@@ -1170,9 +1150,42 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
ty,
);
- let ct =
- self.lower_const_path_to_const_arg(path, res, ty.id, ty.span);
- return GenericArg::Const(ct);
+ // Construct an AnonConst where the expr is the "ty"'s path.
+
+ let parent_def_id = self.current_hir_id_owner;
+ let node_id = self.next_node_id();
+ let span = self.lower_span(ty.span);
+
+ // Add a definition for the in-band const def.
+ let def_id = self.create_def(
+ parent_def_id.def_id,
+ node_id,
+ kw::Empty,
+ DefKind::AnonConst,
+ span,
+ );
+
+ let path_expr = Expr {
+ id: ty.id,
+ kind: ExprKind::Path(None, path.clone()),
+ span,
+ attrs: AttrVec::new(),
+ tokens: None,
+ };
+
+ let ct = self.with_new_scopes(span, |this| {
+ self.arena.alloc(hir::AnonConst {
+ def_id,
+ hir_id: this.lower_node_id(node_id),
+ body: this
+ .lower_const_body(path_expr.span, Some(&path_expr)),
+ span,
+ })
+ });
+ return GenericArg::Const(ConstArg {
+ value: ct,
+ is_desugared_from_effects: false,
+ });
}
}
}
@@ -1180,7 +1193,10 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
}
GenericArg::Type(self.lower_ty(ty, itctx))
}
- ast::GenericArg::Const(ct) => GenericArg::Const(self.lower_anon_const_to_const_arg(ct)),
+ ast::GenericArg::Const(ct) => GenericArg::Const(ConstArg {
+ value: self.lower_anon_const(ct),
+ is_desugared_from_effects: false,
+ }),
}
}
@@ -1339,7 +1355,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
TyKind::Array(ty, length) => {
hir::TyKind::Array(self.lower_ty(ty, itctx), self.lower_array_length(length))
}
- TyKind::Typeof(expr) => hir::TyKind::Typeof(self.lower_anon_const_to_anon_const(expr)),
+ TyKind::Typeof(expr) => hir::TyKind::Typeof(self.lower_anon_const(expr)),
TyKind::TraitObject(bounds, kind) => {
let mut lifetime_bound = None;
let (bounds, lifetime_bound) = self.with_dyn_type_scope(true, |this| {
@@ -1413,7 +1429,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
);
self.create_def(
- self.current_hir_id_owner.def_id, // FIXME: should this use self.current_def_id_parent?
+ self.current_hir_id_owner.def_id,
*def_node_id,
ident.name,
DefKind::TyParam,
@@ -1621,7 +1637,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
lower_item_bounds: impl FnOnce(&mut Self) -> &'hir [hir::GenericBound<'hir>],
) -> hir::TyKind<'hir> {
let opaque_ty_def_id = self.create_def(
- self.current_hir_id_owner.def_id, // FIXME: should this use self.current_def_id_parent?
+ self.current_hir_id_owner.def_id,
opaque_ty_node_id,
kw::Empty,
DefKind::OpaqueTy,
@@ -2206,7 +2222,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
false
}
})
- .map(|def| self.lower_anon_const_to_const_arg(def));
+ .map(|def| self.lower_anon_const(def));
(
hir::ParamName::Plain(self.lower_ident(param.ident)),
@@ -2344,153 +2360,19 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
"using `_` for array lengths is unstable",
)
.stash(c.value.span, StashKey::UnderscoreForArrayLengths);
- hir::ArrayLen::Body(self.lower_anon_const_to_const_arg(c))
+ hir::ArrayLen::Body(self.lower_anon_const(c))
}
}
- _ => hir::ArrayLen::Body(self.lower_anon_const_to_const_arg(c)),
- }
- }
-
- #[instrument(level = "debug", skip(self))]
- fn lower_const_path_to_const_arg(
- &mut self,
- path: &Path,
- res: Res<NodeId>,
- ty_id: NodeId,
- span: Span,
- ) -> &'hir hir::ConstArg<'hir> {
- let ct_kind = match res {
- Res::Def(DefKind::ConstParam, _) => {
- let qpath = self.lower_qpath(
- ty_id,
- &None,
- path,
- ParamMode::Optional,
- ImplTraitContext::Disallowed(ImplTraitPosition::Path),
- None,
- );
- hir::ConstArgKind::Path(qpath)
- }
- _ => {
- // Construct an AnonConst where the expr is the "ty"'s path.
-
- let parent_def_id = self.current_def_id_parent;
- let node_id = self.next_node_id();
- let span = self.lower_span(span);
-
- // Add a definition for the in-band const def.
- let def_id =
- self.create_def(parent_def_id, node_id, kw::Empty, DefKind::AnonConst, span);
- let hir_id = self.lower_node_id(node_id);
-
- let path_expr = Expr {
- id: ty_id,
- kind: ExprKind::Path(None, path.clone()),
- span,
- attrs: AttrVec::new(),
- tokens: None,
- };
-
- let ct = self.with_new_scopes(span, |this| {
- self.arena.alloc(hir::AnonConst {
- def_id,
- hir_id,
- body: this.with_def_id_parent(def_id, |this| {
- this.lower_const_body(path_expr.span, Some(&path_expr))
- }),
- span,
- })
- });
- hir::ConstArgKind::Anon(ct)
- }
- };
-
- self.arena.alloc(hir::ConstArg {
- hir_id: self.next_id(),
- kind: ct_kind,
- is_desugared_from_effects: false,
- })
- }
-
- /// See [`hir::ConstArg`] for when to use this function vs
- /// [`Self::lower_anon_const_to_anon_const`].
- fn lower_anon_const_to_const_arg(&mut self, anon: &AnonConst) -> &'hir hir::ConstArg<'hir> {
- self.arena.alloc(self.lower_anon_const_to_const_arg_direct(anon))
- }
-
- #[instrument(level = "debug", skip(self))]
- fn lower_anon_const_to_const_arg_direct(&mut self, anon: &AnonConst) -> hir::ConstArg<'hir> {
- // Unwrap a block, so that e.g. `{ P }` is recognised as a parameter. Const arguments
- // currently have to be wrapped in curly brackets, so it's necessary to special-case.
- let expr = if let ExprKind::Block(block, _) = &anon.value.kind
- && let [stmt] = block.stmts.as_slice()
- && let StmtKind::Expr(expr) = &stmt.kind
- && let ExprKind::Path(..) = &expr.kind
- {
- expr
- } else {
- &anon.value
- };
- let maybe_res =
- self.resolver.get_partial_res(expr.id).and_then(|partial_res| partial_res.full_res());
- debug!("res={:?}", maybe_res);
- // FIXME(min_generic_const_args): for now we only lower params to ConstArgKind::Path
- if let Some(res) = maybe_res
- && let Res::Def(DefKind::ConstParam, _) = res
- && let ExprKind::Path(qself, path) = &expr.kind
- {
- let qpath = self.lower_qpath(
- expr.id,
- qself,
- path,
- ParamMode::Optional,
- ImplTraitContext::Disallowed(ImplTraitPosition::Path),
- None,
- );
-
- return ConstArg {
- hir_id: self.next_id(),
- kind: hir::ConstArgKind::Path(qpath),
- is_desugared_from_effects: false,
- };
- }
-
- let lowered_anon = self.lower_anon_const_to_anon_const(anon);
- ConstArg {
- hir_id: self.next_id(),
- kind: hir::ConstArgKind::Anon(lowered_anon),
- is_desugared_from_effects: false,
+ _ => hir::ArrayLen::Body(self.lower_anon_const(c)),
}
}
- /// See [`hir::ConstArg`] for when to use this function vs
- /// [`Self::lower_anon_const_to_const_arg`].
- fn lower_anon_const_to_anon_const(&mut self, c: &AnonConst) -> &'hir hir::AnonConst {
- if c.value.is_potential_trivial_const_arg() {
- // HACK(min_generic_const_args): see DefCollector::visit_anon_const
- // Over there, we guess if this is a bare param and only create a def if
- // we think it's not. However we may can guess wrong (see there for example)
- // in which case we have to create the def here.
- self.create_def(
- self.current_def_id_parent,
- c.id,
- kw::Empty,
- DefKind::AnonConst,
- c.value.span,
- );
- }
-
- self.arena.alloc(self.with_new_scopes(c.value.span, |this| {
- let def_id = this.local_def_id(c.id);
- let hir_id = this.lower_node_id(c.id);
- hir::AnonConst {
- def_id,
- hir_id,
- body: this.with_def_id_parent(def_id, |this| {
- this.lower_const_body(c.value.span, Some(&c.value))
- }),
- span: this.lower_span(c.value.span),
- }
+ fn lower_anon_const(&mut self, c: &AnonConst) -> &'hir hir::AnonConst {
+ self.arena.alloc(self.with_new_scopes(c.value.span, |this| hir::AnonConst {
+ def_id: this.local_def_id(c.id),
+ hir_id: this.lower_node_id(c.id),
+ body: this.lower_const_body(c.value.span, Some(&c.value)),
+ span: this.lower_span(c.value.span),
}))
}
diff --git a/compiler/rustc_borrowck/src/type_check/mod.rs b/compiler/rustc_borrowck/src/type_check/mod.rs
index db4b5209145f0..1bb3d812bef7b 100644
--- a/compiler/rustc_borrowck/src/type_check/mod.rs
+++ b/compiler/rustc_borrowck/src/type_check/mod.rs
@@ -2337,10 +2337,16 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
match (cast_ty_from, cast_ty_to) {
(Some(CastTy::Ptr(src)), Some(CastTy::Ptr(dst))) => {
let mut normalize = |t| self.normalize(t, location);
+
+ // N.B. `struct_tail_with_normalize` only "structurally resolves"
+ // the type. It is not fully normalized, so we have to normalize it
+ // afterwards.
let src_tail =
tcx.struct_tail_with_normalize(src.ty, &mut normalize, || ());
+ let src_tail = normalize(src_tail);
let dst_tail =
tcx.struct_tail_with_normalize(dst.ty, &mut normalize, || ());
+ let dst_tail = normalize(dst_tail);
// This checks (lifetime part of) vtable validity for pointer casts,
// which is irrelevant when there are aren't principal traits on both sides (aka only auto traits).
diff --git a/compiler/rustc_feature/src/builtin_attrs.rs b/compiler/rustc_feature/src/builtin_attrs.rs
index 7b27049a579a1..f8bbd27ac319a 100644
--- a/compiler/rustc_feature/src/builtin_attrs.rs
+++ b/compiler/rustc_feature/src/builtin_attrs.rs
@@ -579,12 +579,6 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
EncodeCrossCrate::No, coroutines, experimental!(coroutines)
),
- // `#[pointee]` attribute to designate the pointee type in SmartPointer derive-macro
- gated!(
- pointee, Normal, template!(Word), ErrorFollowing,
- EncodeCrossCrate::No, derive_smart_pointer, experimental!(pointee)
- ),
-
// RFC 3543
// `#[patchable_function_entry(prefix_nops = m, entry_nops = n)]`
gated!(
diff --git a/compiler/rustc_hir/src/hir.rs b/compiler/rustc_hir/src/hir.rs
index bf773f2d48793..3bd7b300758c4 100644
--- a/compiler/rustc_hir/src/hir.rs
+++ b/compiler/rustc_hir/src/hir.rs
@@ -228,53 +228,13 @@ impl<'hir> PathSegment<'hir> {
}
}
-/// A constant that enters the type system, used for arguments to const generics (e.g. array lengths).
-///
-/// These are distinct from [`AnonConst`] as anon consts in the type system are not allowed
-/// to use any generic parameters, therefore we must represent `N` differently. Additionally
-/// future designs for supporting generic parameters in const arguments will likely not use
-/// an anon const based design.
-///
-/// So, `ConstArg` (specifically, [`ConstArgKind`]) distinguishes between const args
-/// that are [just paths](ConstArgKind::Path) (currently just bare const params)
-/// versus const args that are literals or have arbitrary computations (e.g., `{ 1 + 3 }`).
#[derive(Clone, Copy, Debug, HashStable_Generic)]
pub struct ConstArg<'hir> {
- #[stable_hasher(ignore)]
- pub hir_id: HirId,
- pub kind: ConstArgKind<'hir>,
+ pub value: &'hir AnonConst,
/// Indicates whether this comes from a `~const` desugaring.
pub is_desugared_from_effects: bool,
}
-impl<'hir> ConstArg<'hir> {
- pub fn anon_const_hir_id(&self) -> Option<HirId> {
- match self.kind {
- ConstArgKind::Anon(ac) => Some(ac.hir_id),
- _ => None,
- }
- }
-
- pub fn span(&self) -> Span {
- match self.kind {
- ConstArgKind::Path(path) => path.span(),
- ConstArgKind::Anon(anon) => anon.span,
- }
- }
-}
-
-/// See [`ConstArg`].
-#[derive(Clone, Copy, Debug, HashStable_Generic)]
-pub enum ConstArgKind<'hir> {
- /// **Note:** Currently this is only used for bare const params
- /// (`N` where `fn foo<const N: usize>(...)`),
- /// not paths to any const (`N` where `const N: usize = ...`).
- ///
- /// However, in the future, we'll be using it for all of those.
- Path(QPath<'hir>),
- Anon(&'hir AnonConst),
-}
-
#[derive(Clone, Copy, Debug, HashStable_Generic)]
pub struct InferArg {
pub hir_id: HirId,
@@ -291,7 +251,7 @@ impl InferArg {
pub enum GenericArg<'hir> {
Lifetime(&'hir Lifetime),
Type(&'hir Ty<'hir>),
- Const(&'hir ConstArg<'hir>),
+ Const(ConstArg<'hir>),
Infer(InferArg),
}
@@ -300,7 +260,7 @@ impl GenericArg<'_> {
match self {
GenericArg::Lifetime(l) => l.ident.span,
GenericArg::Type(t) => t.span,
- GenericArg::Const(c) => c.span(),
+ GenericArg::Const(c) => c.value.span,
GenericArg::Infer(i) => i.span,
}
}
@@ -309,7 +269,7 @@ impl GenericArg<'_> {
match self {
GenericArg::Lifetime(l) => l.hir_id,
GenericArg::Type(t) => t.hir_id,
- GenericArg::Const(c) => c.hir_id,
+ GenericArg::Const(c) => c.value.hir_id,
GenericArg::Infer(i) => i.hir_id,
}
}
@@ -564,7 +524,7 @@ pub enum GenericParamKind<'hir> {
Const {
ty: &'hir Ty<'hir>,
/// Optional default value for the const generic param
- default: Option<&'hir ConstArg<'hir>>,
+ default: Option<&'hir AnonConst>,
is_host_effect: bool,
synthetic: bool,
},
@@ -1638,13 +1598,13 @@ pub type Lit = Spanned<LitKind>;
#[derive(Copy, Clone, Debug, HashStable_Generic)]
pub enum ArrayLen<'hir> {
Infer(InferArg),
- Body(&'hir ConstArg<'hir>),
+ Body(&'hir AnonConst),
}
impl ArrayLen<'_> {
pub fn hir_id(&self) -> HirId {
match self {
- ArrayLen::Infer(InferArg { hir_id, .. }) | ArrayLen::Body(ConstArg { hir_id, .. }) => {
+ ArrayLen::Infer(InferArg { hir_id, .. }) | ArrayLen::Body(AnonConst { hir_id, .. }) => {
*hir_id
}
}
@@ -2474,7 +2434,7 @@ impl<'hir> AssocItemConstraint<'hir> {
}
/// Obtain the const on the RHS of an assoc const equality constraint if applicable.
- pub fn ct(self) -> Option<&'hir ConstArg<'hir>> {
+ pub fn ct(self) -> Option<&'hir AnonConst> {
match self.kind {
AssocItemConstraintKind::Equality { term: Term::Const(ct) } => Some(ct),
_ => None,
@@ -2485,7 +2445,7 @@ impl<'hir> AssocItemConstraint<'hir> {
#[derive(Debug, Clone, Copy, HashStable_Generic)]
pub enum Term<'hir> {
Ty(&'hir Ty<'hir>),
- Const(&'hir ConstArg<'hir>),
+ Const(&'hir AnonConst),
}
impl<'hir> From<&'hir Ty<'hir>> for Term<'hir> {
@@ -2494,8 +2454,8 @@ impl<'hir> From<&'hir Ty<'hir>> for Term<'hir> {
}
}
-impl<'hir> From<&'hir ConstArg<'hir>> for Term<'hir> {
- fn from(c: &'hir ConstArg<'hir>) -> Self {
+impl<'hir> From<&'hir AnonConst> for Term<'hir> {
+ fn from(c: &'hir AnonConst) -> Self {
Term::Const(c)
}
}
@@ -3729,7 +3689,6 @@ pub enum Node<'hir> {
Field(&'hir FieldDef<'hir>),
AnonConst(&'hir AnonConst),
ConstBlock(&'hir ConstBlock),
- ConstArg(&'hir ConstArg<'hir>),
Expr(&'hir Expr<'hir>),
ExprField(&'hir ExprField<'hir>),
Stmt(&'hir Stmt<'hir>),
@@ -3791,7 +3750,6 @@ impl<'hir> Node<'hir> {
Node::Param(..)
| Node::AnonConst(..)
| Node::ConstBlock(..)
- | Node::ConstArg(..)
| Node::Expr(..)
| Node::Stmt(..)
| Node::Block(..)
@@ -4008,7 +3966,7 @@ mod size_asserts {
static_assert_size!(FnDecl<'_>, 40);
static_assert_size!(ForeignItem<'_>, 72);
static_assert_size!(ForeignItemKind<'_>, 40);
- static_assert_size!(GenericArg<'_>, 16);
+ static_assert_size!(GenericArg<'_>, 24);
static_assert_size!(GenericBound<'_>, 48);
static_assert_size!(Generics<'_>, 56);
static_assert_size!(Impl<'_>, 80);
diff --git a/compiler/rustc_hir/src/intravisit.rs b/compiler/rustc_hir/src/intravisit.rs
index c202ee41e3132..9bb3245ae05af 100644
--- a/compiler/rustc_hir/src/intravisit.rs
+++ b/compiler/rustc_hir/src/intravisit.rs
@@ -347,9 +347,6 @@ pub trait Visitor<'v>: Sized {
fn visit_inline_const(&mut self, c: &'v ConstBlock) -> Self::Result {
walk_inline_const(self, c)
}
- fn visit_const_arg(&mut self, c: &'v ConstArg<'v>) -> Self::Result {
- walk_const_arg(self, c)
- }
fn visit_expr(&mut self, ex: &'v Expr<'v>) -> Self::Result {
walk_expr(self, ex)
}
@@ -367,7 +364,7 @@ pub trait Visitor<'v>: Sized {
fn visit_generic_param(&mut self, p: &'v GenericParam<'v>) -> Self::Result {
walk_generic_param(self, p)
}
- fn visit_const_param_default(&mut self, _param: HirId, ct: &'v ConstArg<'v>) -> Self::Result {
+ fn visit_const_param_default(&mut self, _param: HirId, ct: &'v AnonConst) -> Self::Result {
walk_const_param_default(self, ct)
}
fn visit_generics(&mut self, g: &'v Generics<'v>) -> Self::Result {
@@ -711,7 +708,7 @@ pub fn walk_array_len<'v, V: Visitor<'v>>(visitor: &mut V, len: &'v ArrayLen<'v>
match len {
// FIXME: Use `visit_infer` here.
ArrayLen::Infer(InferArg { hir_id, span: _ }) => visitor.visit_id(*hir_id),
- ArrayLen::Body(c) => visitor.visit_const_arg(c),
+ ArrayLen::Body(c) => visitor.visit_anon_const(c),
}
}
@@ -728,17 +725,6 @@ pub fn walk_inline_const<'v, V: Visitor<'v>>(
visitor.visit_nested_body(constant.body)
}
-pub fn walk_const_arg<'v, V: Visitor<'v>>(
- visitor: &mut V,
- const_arg: &'v ConstArg<'v>,
-) -> V::Result {
- try_visit!(visitor.visit_id(const_arg.hir_id));
- match &const_arg.kind {
- ConstArgKind::Path(qpath) => visitor.visit_qpath(qpath, const_arg.hir_id, qpath.span()),
- ConstArgKind::Anon(anon) => visitor.visit_anon_const(*anon),
- }
-}
-
pub fn walk_expr<'v, V: Visitor<'v>>(visitor: &mut V, expression: &'v Expr<'v>) -> V::Result {
try_visit!(visitor.visit_id(expression.hir_id));
match expression.kind {
@@ -942,9 +928,9 @@ pub fn walk_generic_param<'v, V: Visitor<'v>>(
pub fn walk_const_param_default<'v, V: Visitor<'v>>(
visitor: &mut V,
- ct: &'v ConstArg<'v>,
+ ct: &'v AnonConst,
) -> V::Result {
- visitor.visit_const_arg(ct)
+ visitor.visit_anon_const(ct)
}
pub fn walk_generics<'v, V: Visitor<'v>>(visitor: &mut V, generics: &'v Generics<'v>) -> V::Result {
@@ -1230,7 +1216,7 @@ pub fn walk_generic_arg<'v, V: Visitor<'v>>(
match generic_arg {
GenericArg::Lifetime(lt) => visitor.visit_lifetime(lt),
GenericArg::Type(ty) => visitor.visit_ty(ty),
- GenericArg::Const(ct) => visitor.visit_const_arg(ct),
+ GenericArg::Const(ct) => visitor.visit_anon_const(&ct.value),
GenericArg::Infer(inf) => visitor.visit_infer(inf),
}
}
@@ -1292,7 +1278,7 @@ pub fn walk_assoc_item_constraint<'v, V: Visitor<'v>>(
match constraint.kind {
AssocItemConstraintKind::Equality { ref term } => match term {
Term::Ty(ref ty) => try_visit!(visitor.visit_ty(ty)),
- Term::Const(ref c) => try_visit!(visitor.visit_const_arg(c)),
+ Term::Const(ref c) => try_visit!(visitor.visit_anon_const(c)),
},
AssocItemConstraintKind::Bound { bounds } => {
walk_list!(visitor, visit_param_bound, bounds)
diff --git a/compiler/rustc_hir_analysis/src/collect.rs b/compiler/rustc_hir_analysis/src/collect.rs
index 565351268c96b..8318e1f8955c8 100644
--- a/compiler/rustc_hir_analysis/src/collect.rs
+++ b/compiler/rustc_hir_analysis/src/collect.rs
@@ -305,9 +305,7 @@ impl<'tcx> Visitor<'tcx> for CollectItemTypesVisitor<'tcx> {
self.tcx.ensure().type_of(param.def_id);
if let Some(default) = default {
// need to store default and type of default
- if let hir::ConstArgKind::Anon(ac) = default.kind {
- self.tcx.ensure().type_of(ac.def_id);
- }
+ self.tcx.ensure().type_of(default.def_id);
self.tcx.ensure().const_param_default(param.def_id);
}
}
diff --git a/compiler/rustc_hir_analysis/src/collect/generics_of.rs b/compiler/rustc_hir_analysis/src/collect/generics_of.rs
index 690423421b975..22d465c8e62be 100644
--- a/compiler/rustc_hir_analysis/src/collect/generics_of.rs
+++ b/compiler/rustc_hir_analysis/src/collect/generics_of.rs
@@ -13,7 +13,7 @@ use rustc_session::lint;
use rustc_span::symbol::{kw, Symbol};
use rustc_span::Span;
-#[instrument(level = "debug", skip(tcx), ret)]
+#[instrument(level = "debug", skip(tcx))]
pub(super) fn generics_of(tcx: TyCtxt<'_>, def_id: LocalDefId) -> ty::Generics {
use rustc_hir::*;
@@ -102,7 +102,6 @@ pub(super) fn generics_of(tcx: TyCtxt<'_>, def_id: LocalDefId) -> ty::Generics {
None
} else if tcx.features().generic_const_exprs {
let parent_node = tcx.parent_hir_node(hir_id);
- debug!(?parent_node);
if let Node::Variant(Variant { disr_expr: Some(constant), .. }) = parent_node
&& constant.hir_id == hir_id
{
@@ -165,17 +164,13 @@ pub(super) fn generics_of(tcx: TyCtxt<'_>, def_id: LocalDefId) -> ty::Generics {
}
} else {
let parent_node = tcx.parent_hir_node(hir_id);
- let parent_node = match parent_node {
- Node::ConstArg(ca) => tcx.parent_hir_node(ca.hir_id),
- _ => parent_node,
- };
match parent_node {
// HACK(eddyb) this provides the correct generics for repeat
// expressions' count (i.e. `N` in `[x; N]`), and explicit
// `enum` discriminants (i.e. `D` in `enum Foo { Bar = D }`),
// as they shouldn't be able to cause query cycle errors.
- Node::Expr(Expr { kind: ExprKind::Repeat(_, ArrayLen::Body(ct)), .. })
- if ct.anon_const_hir_id() == Some(hir_id) =>
+ Node::Expr(Expr { kind: ExprKind::Repeat(_, constant), .. })
+ if constant.hir_id() == hir_id =>
{
Some(parent_did)
}
diff --git a/compiler/rustc_hir_analysis/src/collect/predicates_of.rs b/compiler/rustc_hir_analysis/src/collect/predicates_of.rs
index 9e430c83e20d7..b89d034fc2e3f 100644
--- a/compiler/rustc_hir_analysis/src/collect/predicates_of.rs
+++ b/compiler/rustc_hir_analysis/src/collect/predicates_of.rs
@@ -388,7 +388,7 @@ fn const_evaluatable_predicates_of(
}
}
- fn visit_const_param_default(&mut self, _param: HirId, _ct: &'tcx hir::ConstArg<'tcx>) {
+ fn visit_const_param_default(&mut self, _param: HirId, _ct: &'tcx hir::AnonConst) {
// Do not look into const param defaults,
// these get checked when they are actually instantiated.
//
diff --git a/compiler/rustc_hir_analysis/src/collect/resolve_bound_vars.rs b/compiler/rustc_hir_analysis/src/collect/resolve_bound_vars.rs
index 7930f54038daf..cad7870a0a1d8 100644
--- a/compiler/rustc_hir_analysis/src/collect/resolve_bound_vars.rs
+++ b/compiler/rustc_hir_analysis/src/collect/resolve_bound_vars.rs
@@ -954,7 +954,7 @@ impl<'a, 'tcx> Visitor<'tcx> for BoundVarContext<'a, 'tcx> {
GenericParamKind::Const { ty, default, .. } => {
self.visit_ty(ty);
if let Some(default) = default {
- self.visit_const_arg(default);
+ self.visit_body(self.tcx.hir().body(default.body));
}
}
}
@@ -1594,7 +1594,7 @@ impl<'a, 'tcx> BoundVarContext<'a, 'tcx> {
i += 1;
}
GenericArg::Const(ct) => {
- self.visit_const_arg(ct);
+ self.visit_anon_const(&ct.value);
i += 1;
}
GenericArg::Infer(inf) => {
diff --git a/compiler/rustc_hir_analysis/src/collect/type_of.rs b/compiler/rustc_hir_analysis/src/collect/type_of.rs
index 9affd654366f1..974dd415f464c 100644
--- a/compiler/rustc_hir_analysis/src/collect/type_of.rs
+++ b/compiler/rustc_hir_analysis/src/collect/type_of.rs
@@ -35,32 +35,16 @@ fn anon_const_type_of<'tcx>(tcx: TyCtxt<'tcx>, def_id: LocalDefId) -> Ty<'tcx> {
let parent_node_id = tcx.parent_hir_id(hir_id);
let parent_node = tcx.hir_node(parent_node_id);
- match parent_node {
- // Anon consts "inside" the type system.
- Node::ConstArg(&ConstArg {
- hir_id: arg_hir_id,
- kind: ConstArgKind::Anon(&AnonConst { hir_id: anon_hir_id, .. }),
- ..
- }) if anon_hir_id == hir_id => const_arg_anon_type_of(tcx, arg_hir_id, span),
-
- // Anon consts outside the type system.
- Node::Expr(&Expr { kind: ExprKind::InlineAsm(asm), .. })
- | Node::Item(&Item { kind: ItemKind::GlobalAsm(asm), .. })
- if asm.operands.iter().any(|(op, _op_sp)| match op {
- hir::InlineAsmOperand::Const { anon_const }
- | hir::InlineAsmOperand::SymFn { anon_const } => anon_const.hir_id == hir_id,
- _ => false,
- }) =>
+ let (generics, arg_idx) = match parent_node {
+ // Easy case: arrays repeat expressions.
+ Node::Ty(&hir::Ty { kind: TyKind::Array(_, ref constant), .. })
+ | Node::Expr(&Expr { kind: ExprKind::Repeat(_, ref constant), .. })
+ if constant.hir_id() == hir_id =>
{
- tcx.typeck(def_id).node_type(hir_id)
- }
- Node::Variant(Variant { disr_expr: Some(ref e), .. }) if e.hir_id == hir_id => {
- tcx.adt_def(tcx.hir().get_parent_item(hir_id)).repr().discr_type().to_ty(tcx)
+ return tcx.types.usize;
}
- // Sort of affects the type system, but only for the purpose of diagnostics
- // so no need for ConstArg.
Node::Ty(&hir::Ty { kind: TyKind::Typeof(ref e), span, .. }) if e.hir_id == hir_id => {
- let ty = tcx.typeck(def_id).node_type(tcx.local_def_id_to_hir_id(def_id));
+ let ty = tcx.typeck(def_id).node_type(e.hir_id);
let ty = tcx.fold_regions(ty, |r, _| {
if r.is_erased() { ty::Region::new_error_misc(tcx) } else { r }
});
@@ -72,35 +56,24 @@ fn anon_const_type_of<'tcx>(tcx: TyCtxt<'tcx>, def_id: LocalDefId) -> Ty<'tcx> {
tcx.dcx().emit_err(TypeofReservedKeywordUsed { span, ty, opt_sugg });
return ty;
}
-
- _ => Ty::new_error_with_message(
- tcx,
- span,
- format!("unexpected anon const parent in type_of(): {parent_node:?}"),
- ),
- }
-}
-
-fn const_arg_anon_type_of<'tcx>(tcx: TyCtxt<'tcx>, arg_hir_id: HirId, span: Span) -> Ty<'tcx> {
- use hir::*;
- use rustc_middle::ty::Ty;
-
- let parent_node_id = tcx.parent_hir_id(arg_hir_id);
- let parent_node = tcx.hir_node(parent_node_id);
-
- let (generics, arg_idx) = match parent_node {
- // Easy case: arrays repeat expressions.
- Node::Ty(&hir::Ty { kind: TyKind::Array(_, ref constant), .. })
- | Node::Expr(&Expr { kind: ExprKind::Repeat(_, ref constant), .. })
- if constant.hir_id() == arg_hir_id =>
+ Node::Expr(&Expr { kind: ExprKind::InlineAsm(asm), .. })
+ | Node::Item(&Item { kind: ItemKind::GlobalAsm(asm), .. })
+ if asm.operands.iter().any(|(op, _op_sp)| match op {
+ hir::InlineAsmOperand::Const { anon_const }
+ | hir::InlineAsmOperand::SymFn { anon_const } => anon_const.hir_id == hir_id,
+ _ => false,
+ }) =>
{
- return tcx.types.usize;
+ return tcx.typeck(def_id).node_type(hir_id);
+ }
+ Node::Variant(Variant { disr_expr: Some(ref e), .. }) if e.hir_id == hir_id => {
+ return tcx.adt_def(tcx.hir().get_parent_item(hir_id)).repr().discr_type().to_ty(tcx);
}
Node::GenericParam(&GenericParam {
def_id: param_def_id,
kind: GenericParamKind::Const { default: Some(ct), .. },
..
- }) if ct.hir_id == arg_hir_id => {
+ }) if ct.hir_id == hir_id => {
return tcx
.type_of(param_def_id)
.no_bound_vars()
@@ -131,7 +104,7 @@ fn const_arg_anon_type_of<'tcx>(tcx: TyCtxt<'tcx>, arg_hir_id: HirId, span: Span
// to a ty::Alias(ty::Projection, `<Self as Foo>::Assoc<3>`).
let item_def_id = tcx
.hir()
- .parent_owner_iter(arg_hir_id)
+ .parent_owner_iter(hir_id)
.find(|(_, node)| matches!(node, OwnerNode::Item(_)))
.unwrap()
.0
@@ -151,7 +124,7 @@ fn const_arg_anon_type_of<'tcx>(tcx: TyCtxt<'tcx>, arg_hir_id: HirId, span: Span
args.args
.iter()
.filter(|arg| arg.is_ty_or_const())
- .position(|arg| arg.hir_id() == arg_hir_id)
+ .position(|arg| arg.hir_id() == hir_id)
})
.unwrap_or_else(|| {
bug!("no arg matching AnonConst in segment");
@@ -172,7 +145,7 @@ fn const_arg_anon_type_of<'tcx>(tcx: TyCtxt<'tcx>, arg_hir_id: HirId, span: Span
ExprKind::MethodCall(segment, ..) | ExprKind::Path(QPath::TypeRelative(_, segment)),
..
}) => {
- let body_owner = tcx.hir().enclosing_body_owner(arg_hir_id);
+ let body_owner = tcx.hir().enclosing_body_owner(hir_id);
let tables = tcx.typeck(body_owner);
// This may fail in case the method/path does not actually exist.
// As there is no relevant param for `def_id`, we simply return
@@ -190,10 +163,10 @@ fn const_arg_anon_type_of<'tcx>(tcx: TyCtxt<'tcx>, arg_hir_id: HirId, span: Span
args.args
.iter()
.filter(|arg| arg.is_ty_or_const())
- .position(|arg| arg.hir_id() == arg_hir_id)
+ .position(|arg| arg.hir_id() == hir_id)
})
.unwrap_or_else(|| {
- bug!("no arg matching ConstArg in segment");
+ bug!("no arg matching AnonConst in segment");
});
(tcx.generics_of(type_dependent_def), idx)
@@ -212,18 +185,18 @@ fn const_arg_anon_type_of<'tcx>(tcx: TyCtxt<'tcx>, arg_hir_id: HirId, span: Span
| ExprKind::Struct(&QPath::Resolved(_, path), ..),
..
}) => {
- let body_owner = tcx.hir().enclosing_body_owner(arg_hir_id);
+ let body_owner = tcx.hir().enclosing_body_owner(hir_id);
let _tables = tcx.typeck(body_owner);
&*path
}
Node::Pat(pat) => {
- if let Some(path) = get_path_containing_arg_in_pat(pat, arg_hir_id) {
+ if let Some(path) = get_path_containing_arg_in_pat(pat, hir_id) {
path
} else {
return Ty::new_error_with_message(
tcx,
span,
- format!("unable to find const parent for {arg_hir_id} in pat {pat:?}"),
+ format!("unable to find const parent for {hir_id} in pat {pat:?}"),
);
}
}
@@ -244,14 +217,14 @@ fn const_arg_anon_type_of<'tcx>(tcx: TyCtxt<'tcx>, arg_hir_id: HirId, span: Span
args.args
.iter()
.filter(|arg| arg.is_ty_or_const())
- .position(|arg| arg.hir_id() == arg_hir_id)
+ .position(|arg| arg.hir_id() == hir_id)
.map(|index| (index, seg))
.or_else(|| {
args.constraints
.iter()
.copied()
.filter_map(AssocItemConstraint::ct)
- .position(|ct| ct.hir_id == arg_hir_id)
+ .position(|ct| ct.hir_id == hir_id)
.map(|idx| (idx, seg))
})
}) else {
@@ -276,7 +249,7 @@ fn const_arg_anon_type_of<'tcx>(tcx: TyCtxt<'tcx>, arg_hir_id: HirId, span: Span
return Ty::new_error_with_message(
tcx,
span,
- format!("unexpected const arg parent in type_of(): {parent_node:?}"),
+ format!("unexpected const parent in type_of(): {parent_node:?}"),
);
}
};
diff --git a/compiler/rustc_hir_analysis/src/hir_ty_lowering/bounds.rs b/compiler/rustc_hir_analysis/src/hir_ty_lowering/bounds.rs
index 6f9c481650b21..a1feef9e15b7e 100644
--- a/compiler/rustc_hir_analysis/src/hir_ty_lowering/bounds.rs
+++ b/compiler/rustc_hir_analysis/src/hir_ty_lowering/bounds.rs
@@ -413,18 +413,12 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
});
// Provide the resolved type of the associated constant to `type_of(AnonConst)`.
- if let Some(const_arg) = constraint.ct() {
- if let hir::ConstArgKind::Anon(anon_const) = const_arg.kind {
- let ty = alias_term
- .map_bound(|alias| tcx.type_of(alias.def_id).instantiate(tcx, alias.args));
- let ty = check_assoc_const_binding_type(
- self,
- constraint.ident,
- ty,
- constraint.hir_id,
- );
- tcx.feed_anon_const_type(anon_const.def_id, ty::EarlyBinder::bind(ty));
- }
+ if let Some(anon_const) = constraint.ct() {
+ let ty = alias_term
+ .map_bound(|alias| tcx.type_of(alias.def_id).instantiate(tcx, alias.args));
+ let ty =
+ check_assoc_const_binding_type(self, constraint.ident, ty, constraint.hir_id);
+ tcx.feed_anon_const_type(anon_const.def_id, ty::EarlyBinder::bind(ty));
}
alias_term
@@ -441,9 +435,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
hir::AssocItemConstraintKind::Equality { term } => {
let term = match term {
hir::Term::Ty(ty) => self.lower_ty(ty).into(),
- hir::Term::Const(ct) => {
- ty::Const::from_const_arg(tcx, ct, ty::FeedConstTy::No).into()
- }
+ hir::Term::Const(ct) => ty::Const::from_anon_const(tcx, ct.def_id).into(),
};
// Find any late-bound regions declared in `ty` that are not
diff --git a/compiler/rustc_hir_analysis/src/hir_ty_lowering/errors.rs b/compiler/rustc_hir_analysis/src/hir_ty_lowering/errors.rs
index 8ff6ced8b3983..968f38cf05d81 100644
--- a/compiler/rustc_hir_analysis/src/hir_ty_lowering/errors.rs
+++ b/compiler/rustc_hir_analysis/src/hir_ty_lowering/errors.rs
@@ -340,7 +340,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
{
let span = match term {
hir::Term::Ty(ty) => ty.span,
- hir::Term::Const(ct) => ct.span(),
+ hir::Term::Const(ct) => tcx.def_span(ct.def_id),
};
(span, Some(ident.span), assoc_item.kind, assoc_kind)
} else {
@@ -1294,7 +1294,8 @@ pub fn prohibit_assoc_item_constraint(
hir::AssocItemConstraintKind::Equality { term: hir::Term::Const(c) },
GenericParamDefKind::Const { .. },
) => {
- suggest_direct_use(&mut err, c.span());
+ let span = tcx.hir().span(c.hir_id);
+ suggest_direct_use(&mut err, span);
}
(hir::AssocItemConstraintKind::Bound { bounds }, _) => {
// Suggest `impl<T: Bound> Trait<T> for Foo` when finding
diff --git a/compiler/rustc_hir_analysis/src/hir_ty_lowering/generics.rs b/compiler/rustc_hir_analysis/src/hir_ty_lowering/generics.rs
index abe2cff321f76..b1c77db9f3700 100644
--- a/compiler/rustc_hir_analysis/src/hir_ty_lowering/generics.rs
+++ b/compiler/rustc_hir_analysis/src/hir_ty_lowering/generics.rs
@@ -113,12 +113,8 @@ fn generic_arg_mismatch_err(
}
}
(GenericArg::Const(cnst), GenericParamDefKind::Type { .. }) => {
- // FIXME(min_generic_const_args): once ConstArgKind::Path is used for non-params too,
- // this should match against that instead of ::Anon
- if let hir::ConstArgKind::Anon(anon) = cnst.kind
- && let body = tcx.hir().body(anon.body)
- && let rustc_hir::ExprKind::Path(rustc_hir::QPath::Resolved(_, path)) =
- body.value.kind
+ let body = tcx.hir().body(cnst.value.body);
+ if let rustc_hir::ExprKind::Path(rustc_hir::QPath::Resolved(_, path)) = body.value.kind
{
if let Res::Def(DefKind::Fn { .. }, id) = path.res {
err.help(format!("`{}` is a function item, not a type", tcx.item_name(id)));
diff --git a/compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs b/compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs
index d6eb1a66902fc..5d75d2dc57f7b 100644
--- a/compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs
+++ b/compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs
@@ -472,10 +472,11 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
handle_ty_args(has_default, &inf.to_ty())
}
(GenericParamDefKind::Const { .. }, GenericArg::Const(ct)) => {
- ty::Const::from_const_arg(tcx, ct, ty::FeedConstTy::Param(param.def_id))
- .into()
+ let did = ct.value.def_id;
+ tcx.feed_anon_const_type(did, tcx.type_of(param.def_id));
+ ty::Const::from_anon_const(tcx, did).into()
}
- (&GenericParamDefKind::Const { .. }, GenericArg::Infer(inf)) => {
+ (&GenericParamDefKind::Const { .. }, hir::GenericArg::Infer(inf)) => {
self.lowerer.ct_infer(Some(param), inf.span).into()
}
(kind, arg) => span_bug!(
@@ -912,8 +913,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
let term: ty::Term<'_> = match term {
hir::Term::Ty(ty) => self.lower_ty(ty).into(),
hir::Term::Const(ct) => {
- ty::Const::from_const_arg(tcx, ct, ty::FeedConstTy::No)
- .into()
+ ty::Const::from_anon_const(tcx, ct.def_id).into()
}
};
// FIXME(#97583): This isn't syntactically well-formed!
@@ -2195,7 +2195,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
let length = match length {
hir::ArrayLen::Infer(inf) => self.ct_infer(None, inf.span),
hir::ArrayLen::Body(constant) => {
- ty::Const::from_const_arg(tcx, constant, ty::FeedConstTy::No)
+ ty::Const::from_anon_const(tcx, constant.def_id)
}
};
diff --git a/compiler/rustc_hir_pretty/src/lib.rs b/compiler/rustc_hir_pretty/src/lib.rs
index db5eba0d9ebaf..5105d60ae188c 100644
--- a/compiler/rustc_hir_pretty/src/lib.rs
+++ b/compiler/rustc_hir_pretty/src/lib.rs
@@ -12,9 +12,8 @@ use rustc_ast_pretty::pp::{self, Breaks};
use rustc_ast_pretty::pprust::{Comments, PrintState};
use rustc_hir as hir;
use rustc_hir::{
- BindingMode, ByRef, ConstArgKind, GenericArg, GenericBound, GenericParam, GenericParamKind,
- HirId, LifetimeParamKind, Node, PatKind, PreciseCapturingArg, RangeEnd, Term,
- TraitBoundModifier,
+ BindingMode, ByRef, GenericArg, GenericBound, GenericParam, GenericParamKind, HirId,
+ LifetimeParamKind, Node, PatKind, PreciseCapturingArg, RangeEnd, Term, TraitBoundModifier,
};
use rustc_span::source_map::SourceMap;
use rustc_span::symbol::{kw, Ident, Symbol};
@@ -88,7 +87,6 @@ impl<'a> State<'a> {
Node::Variant(a) => self.print_variant(a),
Node::AnonConst(a) => self.print_anon_const(a),
Node::ConstBlock(a) => self.print_inline_const(a),
- Node::ConstArg(a) => self.print_const_arg(a),
Node::Expr(a) => self.print_expr(a),
Node::ExprField(a) => self.print_expr_field(a),
Node::Stmt(a) => self.print_stmt(a),
@@ -985,7 +983,7 @@ impl<'a> State<'a> {
fn print_array_length(&mut self, len: &hir::ArrayLen<'_>) {
match len {
hir::ArrayLen::Infer(..) => self.word("_"),
- hir::ArrayLen::Body(ct) => self.print_const_arg(ct),
+ hir::ArrayLen::Body(ct) => self.print_anon_const(ct),
}
}
@@ -993,13 +991,6 @@ impl<'a> State<'a> {
self.ann.nested(self, Nested::Body(constant.body))
}
- fn print_const_arg(&mut self, const_arg: &hir::ConstArg<'_>) {
- match &const_arg.kind {
- ConstArgKind::Path(qpath) => self.print_qpath(qpath, true),
- ConstArgKind::Anon(anon) => self.print_anon_const(anon),
- }
- }
-
fn print_call_post(&mut self, args: &[hir::Expr<'_>]) {
self.popen();
self.commasep_exprs(Inconsistent, args);
@@ -1688,7 +1679,7 @@ impl<'a> State<'a> {
GenericArg::Lifetime(lt) if !elide_lifetimes => s.print_lifetime(lt),
GenericArg::Lifetime(_) => {}
GenericArg::Type(ty) => s.print_type(ty),
- GenericArg::Const(ct) => s.print_const_arg(ct),
+ GenericArg::Const(ct) => s.print_anon_const(&ct.value),
GenericArg::Infer(_inf) => s.word("_"),
}
});
@@ -1729,7 +1720,7 @@ impl<'a> State<'a> {
self.word_space("=");
match term {
Term::Ty(ty) => self.print_type(ty),
- Term::Const(ref c) => self.print_const_arg(c),
+ Term::Const(ref c) => self.print_anon_const(c),
}
}
hir::AssocItemConstraintKind::Bound { bounds } => {
@@ -2164,7 +2155,7 @@ impl<'a> State<'a> {
if let Some(default) = default {
self.space();
self.word_space("=");
- self.print_const_arg(default);
+ self.print_anon_const(default);
}
}
}
diff --git a/compiler/rustc_hir_typeck/src/expr.rs b/compiler/rustc_hir_typeck/src/expr.rs
index d708269f1f538..1032d01e61bf1 100644
--- a/compiler/rustc_hir_typeck/src/expr.rs
+++ b/compiler/rustc_hir_typeck/src/expr.rs
@@ -1447,9 +1447,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
return;
};
if let hir::TyKind::Array(_, length) = ty.peel_refs().kind
- && let hir::ArrayLen::Body(ct) = length
+ && let hir::ArrayLen::Body(&hir::AnonConst { hir_id, .. }) = length
{
- let span = ct.span();
+ let span = self.tcx.hir().span(hir_id);
self.dcx().try_steal_modify_and_emit_err(
span,
StashKey::UnderscoreForArrayLengths,
diff --git a/compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs b/compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs
index cc2c1a302f58b..6da3f1dd11412 100644
--- a/compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs
+++ b/compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs
@@ -457,25 +457,22 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
pub fn lower_array_length(&self, length: &hir::ArrayLen<'tcx>) -> ty::Const<'tcx> {
match length {
hir::ArrayLen::Infer(inf) => self.ct_infer(None, inf.span),
- hir::ArrayLen::Body(const_arg) => {
- let span = const_arg.span();
- let c = ty::Const::from_const_arg(self.tcx, const_arg, ty::FeedConstTy::No);
+ hir::ArrayLen::Body(anon_const) => {
+ let span = self.tcx.def_span(anon_const.def_id);
+ let c = ty::Const::from_anon_const(self.tcx, anon_const.def_id);
self.register_wf_obligation(c.into(), span, ObligationCauseCode::WellFormed(None));
self.normalize(span, c)
}
}
}
- pub fn lower_const_arg(
- &self,
- const_arg: &'tcx hir::ConstArg<'tcx>,
- param_def_id: DefId,
- ) -> ty::Const<'tcx> {
- let ct =
- ty::Const::from_const_arg(self.tcx, const_arg, ty::FeedConstTy::Param(param_def_id));
+ pub fn lower_const_arg(&self, hir_ct: &hir::AnonConst, param_def_id: DefId) -> ty::Const<'tcx> {
+ let did = hir_ct.def_id;
+ self.tcx.feed_anon_const_type(did, self.tcx.type_of(param_def_id));
+ let ct = ty::Const::from_anon_const(self.tcx, did);
self.register_wf_obligation(
ct.into(),
- self.tcx.hir().span(const_arg.hir_id),
+ self.tcx.hir().span(hir_ct.hir_id),
ObligationCauseCode::WellFormed(None),
);
ct
@@ -1301,7 +1298,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
self.fcx.lower_ty(ty).raw.into()
}
(GenericParamDefKind::Const { .. }, GenericArg::Const(ct)) => {
- self.fcx.lower_const_arg(ct, param.def_id).into()
+ self.fcx.lower_const_arg(&ct.value, param.def_id).into()
}
(GenericParamDefKind::Type { .. }, GenericArg::Infer(inf)) => {
self.fcx.ty_infer(Some(param), inf.span).into()
diff --git a/compiler/rustc_hir_typeck/src/method/confirm.rs b/compiler/rustc_hir_typeck/src/method/confirm.rs
index e70431a68ff16..e574fde14fb0a 100644
--- a/compiler/rustc_hir_typeck/src/method/confirm.rs
+++ b/compiler/rustc_hir_typeck/src/method/confirm.rs
@@ -400,7 +400,7 @@ impl<'a, 'tcx> ConfirmContext<'a, 'tcx> {
self.cfcx.lower_ty(ty).raw.into()
}
(GenericParamDefKind::Const { .. }, GenericArg::Const(ct)) => {
- self.cfcx.lower_const_arg(ct, param.def_id).into()
+ self.cfcx.lower_const_arg(&ct.value, param.def_id).into()
}
(GenericParamDefKind::Type { .. }, GenericArg::Infer(inf)) => {
self.cfcx.ty_infer(Some(param), inf.span).into()
diff --git a/compiler/rustc_infer/src/error_reporting/infer/mod.rs b/compiler/rustc_infer/src/error_reporting/infer/mod.rs
index 9998fbca056c3..1401d16108a37 100644
--- a/compiler/rustc_infer/src/error_reporting/infer/mod.rs
+++ b/compiler/rustc_infer/src/error_reporting/infer/mod.rs
@@ -1762,9 +1762,9 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
};
if let Some(tykind) = tykind
&& let hir::TyKind::Array(_, length) = tykind
- && let hir::ArrayLen::Body(ct) = length
+ && let hir::ArrayLen::Body(hir::AnonConst { hir_id, .. }) = length
{
- let span = ct.span();
+ let span = self.tcx.hir().span(*hir_id);
Some(TypeErrorAdditionalDiags::ConsiderSpecifyingLength { span, length: sz.found })
} else {
None
diff --git a/compiler/rustc_lint/src/pass_by_value.rs b/compiler/rustc_lint/src/pass_by_value.rs
index fa23f120468a4..c1f5cd45dc824 100644
--- a/compiler/rustc_lint/src/pass_by_value.rs
+++ b/compiler/rustc_lint/src/pass_by_value.rs
@@ -78,7 +78,7 @@ fn gen_args(cx: &LateContext<'_>, segment: &PathSegment<'_>) -> String {
.tcx
.sess
.source_map()
- .span_to_snippet(c.span())
+ .span_to_snippet(c.value.span)
.unwrap_or_else(|_| "_".into()),
GenericArg::Infer(_) => String::from("_"),
})
diff --git a/compiler/rustc_middle/src/hir/map/mod.rs b/compiler/rustc_middle/src/hir/map/mod.rs
index ad59bfa904729..2f3a6ee601b15 100644
--- a/compiler/rustc_middle/src/hir/map/mod.rs
+++ b/compiler/rustc_middle/src/hir/map/mod.rs
@@ -912,7 +912,6 @@ impl<'hir> Map<'hir> {
Node::Field(field) => field.span,
Node::AnonConst(constant) => constant.span,
Node::ConstBlock(constant) => self.body(constant.body).value.span,
- Node::ConstArg(const_arg) => const_arg.span(),
Node::Expr(expr) => expr.span,
Node::ExprField(field) => field.span,
Node::Stmt(stmt) => stmt.span,
@@ -963,8 +962,7 @@ impl<'hir> Map<'hir> {
/// Returns the HirId of `N` in `struct Foo<const N: usize = { ... }>` when
/// called with the HirId for the `{ ... }` anon const
pub fn opt_const_param_default_param_def_id(self, anon_const: HirId) -> Option<LocalDefId> {
- let const_arg = self.tcx.parent_hir_id(anon_const);
- match self.tcx.parent_hir_node(const_arg) {
+ match self.tcx.parent_hir_node(anon_const) {
Node::GenericParam(GenericParam {
def_id: param_id,
kind: GenericParamKind::Const { .. },
@@ -1184,7 +1182,6 @@ fn hir_id_to_string(map: Map<'_>, id: HirId) -> String {
}
Node::AnonConst(_) => node_str("const"),
Node::ConstBlock(_) => node_str("const"),
- Node::ConstArg(_) => node_str("const"),
Node::Expr(_) => node_str("expr"),
Node::ExprField(_) => node_str("expr field"),
Node::Stmt(_) => node_str("stmt"),
diff --git a/compiler/rustc_middle/src/ty/consts.rs b/compiler/rustc_middle/src/ty/consts.rs
index 5cf1247f0c820..4d213d14af126 100644
--- a/compiler/rustc_middle/src/ty/consts.rs
+++ b/compiler/rustc_middle/src/ty/consts.rs
@@ -4,9 +4,9 @@ use crate::ty::{self, GenericArgs, ParamEnv, ParamEnvAnd, Ty, TyCtxt, TypeVisita
use either::Either;
use rustc_data_structures::intern::Interned;
use rustc_error_messages::MultiSpan;
+use rustc_hir as hir;
use rustc_hir::def::{DefKind, Res};
-use rustc_hir::def_id::{DefId, LocalDefId};
-use rustc_hir::{self as hir, HirId};
+use rustc_hir::def_id::LocalDefId;
use rustc_macros::HashStable;
use rustc_type_ir::{self as ir, TypeFlags, WithCachedTypeInfo};
use tracing::{debug, instrument};
@@ -183,55 +183,16 @@ impl<'tcx> rustc_type_ir::inherent::Const<TyCtxt<'tcx>> for Const<'tcx> {
}
}
-/// In some cases, [`hir::ConstArg`]s that are being used in the type system
-/// through const generics need to have their type "fed" to them
-/// using the query system.
-///
-/// Use this enum with [`Const::from_const_arg`] to instruct it with the
-/// desired behavior.
-#[derive(Debug, Clone, Copy)]
-pub enum FeedConstTy {
- /// Feed the type.
- ///
- /// The `DefId` belongs to the const param that we are supplying
- /// this (anon) const arg to.
- Param(DefId),
- /// Don't feed the type.
- No,
-}
-
impl<'tcx> Const<'tcx> {
- /// Convert a [`hir::ConstArg`] to a [`ty::Const`](Self).
- #[instrument(skip(tcx), level = "debug")]
- pub fn from_const_arg(
- tcx: TyCtxt<'tcx>,
- const_arg: &'tcx hir::ConstArg<'tcx>,
- feed: FeedConstTy,
- ) -> Self {
- if let FeedConstTy::Param(param_def_id) = feed
- && let hir::ConstArgKind::Anon(anon) = &const_arg.kind
- {
- tcx.feed_anon_const_type(anon.def_id, tcx.type_of(param_def_id));
- }
-
- match const_arg.kind {
- hir::ConstArgKind::Path(qpath) => {
- // FIXME(min_generic_const_args): for now only params are lowered to ConstArgKind::Path
- Self::from_param(tcx, qpath, const_arg.hir_id)
- }
- hir::ConstArgKind::Anon(anon) => Self::from_anon_const(tcx, anon.def_id),
- }
- }
-
/// Literals and const generic parameters are eagerly converted to a constant, everything else
/// becomes `Unevaluated`.
#[instrument(skip(tcx), level = "debug")]
pub fn from_anon_const(tcx: TyCtxt<'tcx>, def: LocalDefId) -> Self {
let body_id = match tcx.hir_node_by_def_id(def) {
hir::Node::AnonConst(ac) => ac.body,
- node => span_bug!(
+ _ => span_bug!(
tcx.def_span(def.to_def_id()),
- "from_anon_const can only process anonymous constants, not {node:?}"
+ "from_anon_const can only process anonymous constants"
),
};
@@ -240,7 +201,7 @@ impl<'tcx> Const<'tcx> {
let ty = tcx.type_of(def).no_bound_vars().expect("const parameter types cannot be generic");
- match Self::try_from_lit(tcx, ty, expr) {
+ match Self::try_from_lit_or_param(tcx, ty, expr) {
Some(v) => v,
None => ty::Const::new_unevaluated(
tcx,
@@ -252,36 +213,12 @@ impl<'tcx> Const<'tcx> {
}
}
- /// Lower a const param to a [`Const`].
- ///
- /// IMPORTANT: `qpath` must be a const param, otherwise this will panic
- fn from_param(tcx: TyCtxt<'tcx>, qpath: hir::QPath<'tcx>, hir_id: HirId) -> Self {
- let hir::QPath::Resolved(_, &hir::Path { res: Res::Def(DefKind::ConstParam, def_id), .. }) =
- qpath
- else {
- span_bug!(qpath.span(), "non-param {qpath:?} passed to Const::from_param")
- };
-
- match tcx.named_bound_var(hir_id) {
- Some(rbv::ResolvedArg::EarlyBound(_)) => {
- // Find the name and index of the const parameter by indexing the generics of
- // the parent item and construct a `ParamConst`.
- let item_def_id = tcx.parent(def_id);
- let generics = tcx.generics_of(item_def_id);
- let index = generics.param_def_id_to_index[&def_id];
- let name = tcx.item_name(def_id);
- ty::Const::new_param(tcx, ty::ParamConst::new(index, name))
- }
- Some(rbv::ResolvedArg::LateBound(debruijn, index, _)) => {
- ty::Const::new_bound(tcx, debruijn, ty::BoundVar::from_u32(index))
- }
- Some(rbv::ResolvedArg::Error(guar)) => ty::Const::new_error(tcx, guar),
- arg => bug!("unexpected bound var resolution for {:?}: {arg:?}", hir_id),
- }
- }
-
#[instrument(skip(tcx), level = "debug")]
- fn try_from_lit(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>, expr: &'tcx hir::Expr<'tcx>) -> Option<Self> {
+ fn try_from_lit_or_param(
+ tcx: TyCtxt<'tcx>,
+ ty: Ty<'tcx>,
+ expr: &'tcx hir::Expr<'tcx>,
+ ) -> Option<Self> {
// Unwrap a block, so that e.g. `{ P }` is recognised as a parameter. Const arguments
// currently have to be wrapped in curly brackets, so it's necessary to special-case.
let expr = match &expr.kind {
@@ -314,15 +251,34 @@ impl<'tcx> Const<'tcx> {
}
}
- if let hir::ExprKind::Path(hir::QPath::Resolved(
- _,
- &hir::Path { res: Res::Def(DefKind::ConstParam, _), .. },
- )) = expr.kind
- {
- span_bug!(expr.span, "try_from_lit: received const param which shouldn't be possible")
+ // FIXME(const_generics): We currently have to special case parameters because `min_const_generics`
+ // does not provide the parents generics to anonymous constants. We still allow generic const
+ // parameters by themselves however, e.g. `N`. These constants would cause an ICE if we were to
+ // ever try to instantiate the generic parameters in their bodies.
+ match expr.kind {
+ hir::ExprKind::Path(hir::QPath::Resolved(
+ _,
+ &hir::Path { res: Res::Def(DefKind::ConstParam, def_id), .. },
+ )) => {
+ match tcx.named_bound_var(expr.hir_id) {
+ Some(rbv::ResolvedArg::EarlyBound(_)) => {
+ // Find the name and index of the const parameter by indexing the generics of
+ // the parent item and construct a `ParamConst`.
+ let item_def_id = tcx.parent(def_id);
+ let generics = tcx.generics_of(item_def_id);
+ let index = generics.param_def_id_to_index[&def_id];
+ let name = tcx.item_name(def_id);
+ Some(ty::Const::new_param(tcx, ty::ParamConst::new(index, name)))
+ }
+ Some(rbv::ResolvedArg::LateBound(debruijn, index, _)) => {
+ Some(ty::Const::new_bound(tcx, debruijn, ty::BoundVar::from_u32(index)))
+ }
+ Some(rbv::ResolvedArg::Error(guar)) => Some(ty::Const::new_error(tcx, guar)),
+ arg => bug!("unexpected bound var resolution for {:?}: {arg:?}", expr.hir_id),
+ }
+ }
+ _ => None,
}
-
- None
}
#[inline]
@@ -527,15 +483,15 @@ pub fn const_param_default<'tcx>(
tcx: TyCtxt<'tcx>,
def_id: LocalDefId,
) -> ty::EarlyBinder<'tcx, Const<'tcx>> {
- let default_ct = match tcx.hir_node_by_def_id(def_id) {
+ let default_def_id = match tcx.hir_node_by_def_id(def_id) {
hir::Node::GenericParam(hir::GenericParam {
- kind: hir::GenericParamKind::Const { default: Some(ct), .. },
+ kind: hir::GenericParamKind::Const { default: Some(ac), .. },
..
- }) => ct,
+ }) => ac.def_id,
_ => span_bug!(
tcx.def_span(def_id),
"`const_param_default` expected a generic parameter with a constant"
),
};
- ty::EarlyBinder::bind(Const::from_const_arg(tcx, default_ct, FeedConstTy::No))
+ ty::EarlyBinder::bind(Const::from_anon_const(tcx, default_def_id))
}
diff --git a/compiler/rustc_middle/src/ty/mod.rs b/compiler/rustc_middle/src/ty/mod.rs
index bd073cd891f69..9a4562e9cfc83 100644
--- a/compiler/rustc_middle/src/ty/mod.rs
+++ b/compiler/rustc_middle/src/ty/mod.rs
@@ -86,7 +86,7 @@ pub use self::closure::{
CAPTURE_STRUCT_LOCAL,
};
pub use self::consts::{
- Const, ConstInt, ConstKind, Expr, ExprKind, FeedConstTy, ScalarInt, UnevaluatedConst, ValTree,
+ Const, ConstInt, ConstKind, Expr, ExprKind, ScalarInt, UnevaluatedConst, ValTree,
};
pub use self::context::{
tls, CtxtInterners, CurrentGcx, DeducedParamAttrs, Feed, FreeRegionInfo, GlobalCtxt, Lift,
diff --git a/compiler/rustc_middle/src/ty/typeck_results.rs b/compiler/rustc_middle/src/ty/typeck_results.rs
index a6dec66449e9f..24e3e623ff274 100644
--- a/compiler/rustc_middle/src/ty/typeck_results.rs
+++ b/compiler/rustc_middle/src/ty/typeck_results.rs
@@ -607,9 +607,7 @@ impl<'a, V> ::std::ops::Index<HirId> for LocalTableInContext<'a, V> {
type Output = V;
fn index(&self, key: HirId) -> &V {
- self.get(key).unwrap_or_else(|| {
- bug!("LocalTableInContext({:?}): key {:?} not found", self.hir_owner, key)
- })
+ self.get(key).expect("LocalTableInContext: key not found")
}
}
diff --git a/compiler/rustc_mir_transform/src/jump_threading.rs b/compiler/rustc_mir_transform/src/jump_threading.rs
index 2100f4b4a1af5..96c52845a4a39 100644
--- a/compiler/rustc_mir_transform/src/jump_threading.rs
+++ b/compiler/rustc_mir_transform/src/jump_threading.rs
@@ -509,6 +509,13 @@ impl<'tcx, 'a> TOFinder<'tcx, 'a> {
BinOp::Ne => ScalarInt::FALSE,
_ => return None,
};
+ if value.const_.ty().is_floating_point() {
+ // Floating point equality does not follow bit-patterns.
+ // -0.0 and NaN both have special rules for equality,
+ // and therefore we cannot use integer comparisons for them.
+ // Avoid handling them, though this could be extended in the future.
+ return None;
+ }
let value = value.const_.normalize(self.tcx, self.param_env).try_to_scalar_int()?;
let conds = conditions.map(self.arena, |c| Condition {
value,
diff --git a/compiler/rustc_parse/src/parser/mod.rs b/compiler/rustc_parse/src/parser/mod.rs
index 7326b9ec51f2b..8e1c31a0b80b7 100644
--- a/compiler/rustc_parse/src/parser/mod.rs
+++ b/compiler/rustc_parse/src/parser/mod.rs
@@ -1121,10 +1121,12 @@ impl<'a> Parser<'a> {
match self.token_cursor.tree_cursor.look_ahead(0) {
Some(tree) => {
// Indexing stayed within the current token tree.
- return match tree {
- TokenTree::Token(token, _) => looker(token),
- TokenTree::Delimited(dspan, _, delim, _) => {
- looker(&Token::new(token::OpenDelim(*delim), dspan.open))
+ match tree {
+ TokenTree::Token(token, _) => return looker(token),
+ &TokenTree::Delimited(dspan, _, delim, _) => {
+ if delim != Delimiter::Invisible {
+ return looker(&Token::new(token::OpenDelim(delim), dspan.open));
+ }
}
};
}
diff --git a/compiler/rustc_passes/src/hir_stats.rs b/compiler/rustc_passes/src/hir_stats.rs
index fb7529d93ed91..0720efebf9721 100644
--- a/compiler/rustc_passes/src/hir_stats.rs
+++ b/compiler/rustc_passes/src/hir_stats.rs
@@ -452,7 +452,7 @@ impl<'v> hir_visit::Visitor<'v> for StatCollector<'v> {
match ga {
hir::GenericArg::Lifetime(lt) => self.visit_lifetime(lt),
hir::GenericArg::Type(ty) => self.visit_ty(ty),
- hir::GenericArg::Const(ct) => self.visit_const_arg(ct),
+ hir::GenericArg::Const(ct) => self.visit_anon_const(&ct.value),
hir::GenericArg::Infer(inf) => self.visit_infer(inf),
}
}
diff --git a/compiler/rustc_resolve/src/def_collector.rs b/compiler/rustc_resolve/src/def_collector.rs
index 1fb942de7343e..a4fdb4a0bafaa 100644
--- a/compiler/rustc_resolve/src/def_collector.rs
+++ b/compiler/rustc_resolve/src/def_collector.rs
@@ -312,19 +312,8 @@ impl<'a, 'b, 'tcx> visit::Visitor<'a> for DefCollector<'a, 'b, 'tcx> {
}
fn visit_anon_const(&mut self, constant: &'a AnonConst) {
- // HACK(min_generic_const_args): don't create defs for anon consts if we think they will
- // later be turned into ConstArgKind::Path's. because this is before resolve is done, we
- // may accidentally identify a construction of a unit struct as a param and not create a
- // def. we'll then create a def later in ast lowering in this case. the parent of nested
- // items will be messed up, but that's ok because there can't be any if we're just looking
- // for bare idents.
- if constant.value.is_potential_trivial_const_arg() {
- visit::walk_anon_const(self, constant)
- } else {
- let def =
- self.create_def(constant.id, kw::Empty, DefKind::AnonConst, constant.value.span);
- self.with_parent(def, |this| visit::walk_anon_const(this, constant));
- }
+ let def = self.create_def(constant.id, kw::Empty, DefKind::AnonConst, constant.value.span);
+ self.with_parent(def, |this| visit::walk_anon_const(this, constant));
}
fn visit_expr(&mut self, expr: &'a Expr) {
diff --git a/compiler/rustc_trait_selection/src/traits/wf.rs b/compiler/rustc_trait_selection/src/traits/wf.rs
index e77a05dd8e63c..f071dc6c78486 100644
--- a/compiler/rustc_trait_selection/src/traits/wf.rs
+++ b/compiler/rustc_trait_selection/src/traits/wf.rs
@@ -672,21 +672,9 @@ impl<'a, 'tcx> TypeVisitor<TyCtxt<'tcx>> for WfPredicates<'a, 'tcx> {
self.require_sized(subty, ObligationCauseCode::SliceOrArrayElem);
}
- ty::Array(subty, len) => {
+ ty::Array(subty, _) => {
self.require_sized(subty, ObligationCauseCode::SliceOrArrayElem);
- // Note that the len being WF is implicitly checked while visiting.
- // Here we just check that it's of type usize.
- let cause = self.cause(ObligationCauseCode::Misc);
- self.out.push(traits::Obligation::with_depth(
- tcx,
- cause,
- self.recursion_depth,
- self.param_env,
- ty::Binder::dummy(ty::PredicateKind::Clause(ty::ClauseKind::ConstArgHasType(
- len,
- tcx.types.usize,
- ))),
- ));
+ // Note that we handle the len is implicitly checked while walking `arg`.
}
ty::Pat(subty, _) => {
diff --git a/library/alloc/src/slice.rs b/library/alloc/src/slice.rs
index c7960b3fb49c3..ef7469c68de62 100644
--- a/library/alloc/src/slice.rs
+++ b/library/alloc/src/slice.rs
@@ -179,15 +179,25 @@ impl<T> [T] {
/// This sort is stable (i.e., does not reorder equal elements) and *O*(*n* \* log(*n*))
/// worst-case.
///
- /// If `T: Ord` does not implement a total order the resulting order is unspecified. All
- /// original elements will remain in the slice and any possible modifications via interior
- /// mutability are observed in the input. Same is true if `T: Ord` panics.
+ /// If the implementation of [`Ord`] for `T` does not implement a [total order] the resulting
+ /// order of elements in the slice is unspecified. All original elements will remain in the
+ /// slice and any possible modifications via interior mutability are observed in the input. Same
+ /// is true if the implementation of [`Ord`] for `T` panics.
///
/// When applicable, unstable sorting is preferred because it is generally faster than stable
/// sorting and it doesn't allocate auxiliary memory. See
/// [`sort_unstable`](slice::sort_unstable). The exception are partially sorted slices, which
/// may be better served with `slice::sort`.
///
+ /// Sorting types that only implement [`PartialOrd`] such as [`f32`] and [`f64`] require
+ /// additional precautions. For example, `f32::NAN != f32::NAN`, which doesn't fulfill the
+ /// reflexivity requirement of [`Ord`]. By using an alternative comparison function with
+ /// `slice::sort_by` such as [`f32::total_cmp`] or [`f64::total_cmp`] that defines a [total
+ /// order] users can sort slices containing floating-point values. Alternatively, if all values
+ /// in the slice are guaranteed to be in a subset for which [`PartialOrd::partial_cmp`] forms a
+ /// [total order], it's possible to sort the slice with `sort_by(|a, b|
+ /// a.partial_cmp(b).unwrap())`.
+ ///
/// # Current implementation
///
/// The current implementation is based on [driftsort] by Orson Peters and Lukas Bergdoll, which
@@ -199,18 +209,21 @@ impl<T> [T] {
/// handled without allocation, medium sized slices allocate `self.len()` and beyond that it
/// clamps at `self.len() / 2`.
///
- /// If `T: Ord` does not implement a total order, the implementation may panic.
+ /// # Panics
+ ///
+ /// May panic if the implementation of [`Ord`] for `T` does not implement a [total order].
///
/// # Examples
///
/// ```
- /// let mut v = [-5, 4, 1, -3, 2];
+ /// let mut v = [4, -5, 1, -3, 2];
///
/// v.sort();
- /// assert!(v == [-5, -3, 1, 2, 4]);
+ /// assert_eq!(v, [-5, -3, 1, 2, 4]);
/// ```
///
/// [driftsort]: https://github.com/Voultapher/driftsort
+ /// [total order]: https://en.wikipedia.org/wiki/Total_order
#[cfg(not(no_global_oom_handling))]
#[rustc_allow_incoherent_impl]
#[stable(feature = "rust1", since = "1.0.0")]
@@ -222,30 +235,19 @@ impl<T> [T] {
stable_sort(self, T::lt);
}
- /// Sorts the slice with a comparator function, preserving initial order of equal elements.
+ /// Sorts the slice with a comparison function, preserving initial order of equal elements.
///
/// This sort is stable (i.e., does not reorder equal elements) and *O*(*n* \* log(*n*))
/// worst-case.
///
- /// The comparator function should define a total ordering for the elements in the slice. If the
- /// ordering is not total, the order of the elements is unspecified.
- ///
- /// If the comparator function does not implement a total order the resulting order is
- /// unspecified. All original elements will remain in the slice and any possible modifications
- /// via interior mutability are observed in the input. Same is true if the comparator function
- /// panics. A total order (for all `a`, `b` and `c`):
+ /// If the comparison function `compare` does not implement a [total order] the resulting order
+ /// of elements in the slice is unspecified. All original elements will remain in the slice and
+ /// any possible modifications via interior mutability are observed in the input. Same is true
+ /// if `compare` panics.
///
- /// * total and antisymmetric: exactly one of `a < b`, `a == b` or `a > b` is true, and
- /// * transitive, `a < b` and `b < c` implies `a < c`. The same must hold for both `==` and `>`.
- ///
- /// For example, while [`f64`] doesn't implement [`Ord`] because `NaN != NaN`, we can use
- /// `partial_cmp` as our sort function when we know the slice doesn't contain a `NaN`.
- ///
- /// ```
- /// let mut floats = [5f64, 4.0, 1.0, 3.0, 2.0];
- /// floats.sort_unstable_by(|a, b| a.partial_cmp(b).unwrap());
- /// assert_eq!(floats, [1.0, 2.0, 3.0, 4.0, 5.0]);
- /// ```
+ /// For example `|a, b| (a - b).cmp(a)` is a comparison function that is neither transitive nor
+ /// reflexive nor total, `a < b < c < a` with `a = 1, b = 2, c = 3`. For more information and
+ /// examples see the [`Ord`] documentation.
///
/// # Current implementation
///
@@ -258,21 +260,24 @@ impl<T> [T] {
/// handled without allocation, medium sized slices allocate `self.len()` and beyond that it
/// clamps at `self.len() / 2`.
///
- /// If `T: Ord` does not implement a total order, the implementation may panic.
+ /// # Panics
+ ///
+ /// May panic if `compare` does not implement a [total order].
///
/// # Examples
///
/// ```
- /// let mut v = [5, 4, 1, 3, 2];
+ /// let mut v = [4, -5, 1, -3, 2];
/// v.sort_by(|a, b| a.cmp(b));
- /// assert!(v == [1, 2, 3, 4, 5]);
+ /// assert_eq!(v, [-5, -3, 1, 2, 4]);
///
/// // reverse sorting
/// v.sort_by(|a, b| b.cmp(a));
- /// assert!(v == [5, 4, 3, 2, 1]);
+ /// assert_eq!(v, [4, 2, 1, -3, -5]);
/// ```
///
/// [driftsort]: https://github.com/Voultapher/driftsort
+ /// [total order]: https://en.wikipedia.org/wiki/Total_order
#[cfg(not(no_global_oom_handling))]
#[rustc_allow_incoherent_impl]
#[stable(feature = "rust1", since = "1.0.0")]
@@ -289,9 +294,10 @@ impl<T> [T] {
/// This sort is stable (i.e., does not reorder equal elements) and *O*(*m* \* *n* \* log(*n*))
/// worst-case, where the key function is *O*(*m*).
///
- /// If `K: Ord` does not implement a total order the resulting order is unspecified.
- /// All original elements will remain in the slice and any possible modifications via interior
- /// mutability are observed in the input. Same is true if `K: Ord` panics.
+ /// If the implementation of [`Ord`] for `K` does not implement a [total order] the resulting
+ /// order of elements in the slice is unspecified. All original elements will remain in the
+ /// slice and any possible modifications via interior mutability are observed in the input. Same
+ /// is true if the implementation of [`Ord`] for `K` panics.
///
/// # Current implementation
///
@@ -304,18 +310,21 @@ impl<T> [T] {
/// handled without allocation, medium sized slices allocate `self.len()` and beyond that it
/// clamps at `self.len() / 2`.
///
- /// If `K: Ord` does not implement a total order, the implementation may panic.
+ /// # Panics
+ ///
+ /// May panic if the implementation of [`Ord`] for `K` does not implement a [total order].
///
/// # Examples
///
/// ```
- /// let mut v = [-5i32, 4, 1, -3, 2];
+ /// let mut v = [4i32, -5, 1, -3, 2];
///
/// v.sort_by_key(|k| k.abs());
- /// assert!(v == [1, 2, -3, 4, -5]);
+ /// assert_eq!(v, [1, 2, -3, 4, -5]);
/// ```
///
/// [driftsort]: https://github.com/Voultapher/driftsort
+ /// [total order]: https://en.wikipedia.org/wiki/Total_order
#[cfg(not(no_global_oom_handling))]
#[rustc_allow_incoherent_impl]
#[stable(feature = "slice_sort_by_key", since = "1.7.0")]
@@ -337,9 +346,10 @@ impl<T> [T] {
/// storage to remember the results of key evaluation. The order of calls to the key function is
/// unspecified and may change in future versions of the standard library.
///
- /// If `K: Ord` does not implement a total order the resulting order is unspecified.
- /// All original elements will remain in the slice and any possible modifications via interior
- /// mutability are observed in the input. Same is true if `K: Ord` panics.
+ /// If the implementation of [`Ord`] for `K` does not implement a [total order] the resulting
+ /// order of elements in the slice is unspecified. All original elements will remain in the
+ /// slice and any possible modifications via interior mutability are observed in the input. Same
+ /// is true if the implementation of [`Ord`] for `K` panics.
///
/// For simple key functions (e.g., functions that are property accesses or basic operations),
/// [`sort_by_key`](slice::sort_by_key) is likely to be faster.
@@ -356,16 +366,22 @@ impl<T> [T] {
/// In the worst case, the algorithm allocates temporary storage in a `Vec<(K, usize)>` the
/// length of the slice.
///
+ /// # Panics
+ ///
+ /// May panic if the implementation of [`Ord`] for `K` does not implement a [total order].
+ ///
/// # Examples
///
/// ```
- /// let mut v = [-5i32, 4, 32, -3, 2];
+ /// let mut v = [4i32, -5, 1, -3, 2, 10];
///
+ /// // Strings are sorted by lexicographical order.
/// v.sort_by_cached_key(|k| k.to_string());
- /// assert!(v == [-3, -5, 2, 32, 4]);
+ /// assert_eq!(v, [-3, -5, 1, 10, 2, 4]);
/// ```
///
/// [ipnsort]: https://github.com/Voultapher/sort-research-rs/tree/main/ipnsort
+ /// [total order]: https://en.wikipedia.org/wiki/Total_order
#[cfg(not(no_global_oom_handling))]
#[rustc_allow_incoherent_impl]
#[stable(feature = "slice_sort_by_cached_key", since = "1.34.0")]
diff --git a/library/core/src/marker.rs b/library/core/src/marker.rs
index 21abd7c036ba7..928f662451370 100644
--- a/library/core/src/marker.rs
+++ b/library/core/src/marker.rs
@@ -1018,7 +1018,7 @@ pub trait FnPtr: Copy + Clone {
/// Derive macro generating impls of traits related to smart pointers.
#[cfg(not(bootstrap))]
-#[rustc_builtin_macro]
+#[rustc_builtin_macro(SmartPointer, attributes(pointee))]
#[allow_internal_unstable(dispatch_from_dyn, coerce_unsized, unsize)]
#[unstable(feature = "derive_smart_pointer", issue = "123430")]
pub macro SmartPointer($item:item) {
diff --git a/library/core/src/slice/mod.rs b/library/core/src/slice/mod.rs
index 68508e85f8e14..af99d52600c8b 100644
--- a/library/core/src/slice/mod.rs
+++ b/library/core/src/slice/mod.rs
@@ -31,6 +31,7 @@ pub mod memchr;
issue = "none",
reason = "exposed from core to be reused in std;"
)]
+#[doc(hidden)]
pub mod sort;
mod ascii;
@@ -2884,9 +2885,19 @@ impl<T> [T] {
/// This sort is unstable (i.e., may reorder equal elements), in-place (i.e., does not
/// allocate), and *O*(*n* \* log(*n*)) worst-case.
///
- /// If `T: Ord` does not implement a total order the resulting order is unspecified. All
- /// original elements will remain in the slice and any possible modifications via interior
- /// mutability are observed in the input. Same is true if `T: Ord` panics.
+ /// If the implementation of [`Ord`] for `T` does not implement a [total order] the resulting
+ /// order of elements in the slice is unspecified. All original elements will remain in the
+ /// slice and any possible modifications via interior mutability are observed in the input. Same
+ /// is true if the implementation of [`Ord`] for `T` panics.
+ ///
+ /// Sorting types that only implement [`PartialOrd`] such as [`f32`] and [`f64`] require
+ /// additional precautions. For example, `f32::NAN != f32::NAN`, which doesn't fulfill the
+ /// reflexivity requirement of [`Ord`]. By using an alternative comparison function with
+ /// `slice::sort_unstable_by` such as [`f32::total_cmp`] or [`f64::total_cmp`] that defines a
+ /// [total order] users can sort slices containing floating-point values. Alternatively, if all
+ /// values in the slice are guaranteed to be in a subset for which [`PartialOrd::partial_cmp`]
+ /// forms a [total order], it's possible to sort the slice with `sort_unstable_by(|a, b|
+ /// a.partial_cmp(b).unwrap())`.
///
/// # Current implementation
///
@@ -2898,18 +2909,21 @@ impl<T> [T] {
/// It is typically faster than stable sorting, except in a few special cases, e.g., when the
/// slice is partially sorted.
///
- /// If `T: Ord` does not implement a total order, the implementation may panic.
+ /// # Panics
+ ///
+ /// May panic if the implementation of [`Ord`] for `T` does not implement a [total order].
///
/// # Examples
///
/// ```
- /// let mut v = [-5, 4, 1, -3, 2];
+ /// let mut v = [4, -5, 1, -3, 2];
///
/// v.sort_unstable();
- /// assert!(v == [-5, -3, 1, 2, 4]);
+ /// assert_eq!(v, [-5, -3, 1, 2, 4]);
/// ```
///
/// [ipnsort]: https://github.com/Voultapher/sort-research-rs/tree/main/ipnsort
+ /// [total order]: https://en.wikipedia.org/wiki/Total_order
#[stable(feature = "sort_unstable", since = "1.20.0")]
#[inline]
pub fn sort_unstable(&mut self)
@@ -2919,31 +2933,20 @@ impl<T> [T] {
sort::unstable::sort(self, &mut T::lt);
}
- /// Sorts the slice with a comparator function, **without** preserving the initial order of
+ /// Sorts the slice with a comparison function, **without** preserving the initial order of
/// equal elements.
///
/// This sort is unstable (i.e., may reorder equal elements), in-place (i.e., does not
/// allocate), and *O*(*n* \* log(*n*)) worst-case.
///
- /// The comparator function should define a total ordering for the elements in the slice. If the
- /// ordering is not total, the order of the elements is unspecified.
- ///
- /// If the comparator function does not implement a total order the resulting order is
- /// unspecified. All original elements will remain in the slice and any possible modifications
- /// via interior mutability are observed in the input. Same is true if the comparator function
- /// panics. A total order (for all `a`, `b` and `c`):
- ///
- /// * total and antisymmetric: exactly one of `a < b`, `a == b` or `a > b` is true, and
- /// * transitive, `a < b` and `b < c` implies `a < c`. The same must hold for both `==` and `>`.
+ /// If the comparison function `compare` does not implement a [total order] the resulting order
+ /// of elements in the slice is unspecified. All original elements will remain in the slice and
+ /// any possible modifications via interior mutability are observed in the input. Same is true
+ /// if `compare` panics.
///
- /// For example, while [`f64`] doesn't implement [`Ord`] because `NaN != NaN`, we can use
- /// `partial_cmp` as our sort function when we know the slice doesn't contain a `NaN`.
- ///
- /// ```
- /// let mut floats = [5f64, 4.0, 1.0, 3.0, 2.0];
- /// floats.sort_unstable_by(|a, b| a.partial_cmp(b).unwrap());
- /// assert_eq!(floats, [1.0, 2.0, 3.0, 4.0, 5.0]);
- /// ```
+ /// For example `|a, b| (a - b).cmp(a)` is a comparison function that is neither transitive nor
+ /// reflexive nor total, `a < b < c < a` with `a = 1, b = 2, c = 3`. For more information and
+ /// examples see the [`Ord`] documentation.
///
/// # Current implementation
///
@@ -2955,21 +2958,24 @@ impl<T> [T] {
/// It is typically faster than stable sorting, except in a few special cases, e.g., when the
/// slice is partially sorted.
///
- /// If `T: Ord` does not implement a total order, the implementation may panic.
+ /// # Panics
+ ///
+ /// May panic if `compare` does not implement a [total order].
///
/// # Examples
///
/// ```
- /// let mut v = [5, 4, 1, 3, 2];
+ /// let mut v = [4, -5, 1, -3, 2];
/// v.sort_unstable_by(|a, b| a.cmp(b));
- /// assert!(v == [1, 2, 3, 4, 5]);
+ /// assert_eq!(v, [-5, -3, 1, 2, 4]);
///
/// // reverse sorting
/// v.sort_unstable_by(|a, b| b.cmp(a));
- /// assert!(v == [5, 4, 3, 2, 1]);
+ /// assert_eq!(v, [4, 2, 1, -3, -5]);
/// ```
///
/// [ipnsort]: https://github.com/Voultapher/sort-research-rs/tree/main/ipnsort
+ /// [total order]: https://en.wikipedia.org/wiki/Total_order
#[stable(feature = "sort_unstable", since = "1.20.0")]
#[inline]
pub fn sort_unstable_by<F>(&mut self, mut compare: F)
@@ -2985,9 +2991,10 @@ impl<T> [T] {
/// This sort is unstable (i.e., may reorder equal elements), in-place (i.e., does not
/// allocate), and *O*(*n* \* log(*n*)) worst-case.
///
- /// If `K: Ord` does not implement a total order the resulting order is unspecified.
- /// All original elements will remain in the slice and any possible modifications via interior
- /// mutability are observed in the input. Same is true if `K: Ord` panics.
+ /// If the implementation of [`Ord`] for `K` does not implement a [total order] the resulting
+ /// order of elements in the slice is unspecified. All original elements will remain in the
+ /// slice and any possible modifications via interior mutability are observed in the input. Same
+ /// is true if the implementation of [`Ord`] for `K` panics.
///
/// # Current implementation
///
@@ -2999,18 +3006,21 @@ impl<T> [T] {
/// It is typically faster than stable sorting, except in a few special cases, e.g., when the
/// slice is partially sorted.
///
- /// If `K: Ord` does not implement a total order, the implementation may panic.
+ /// # Panics
+ ///
+ /// May panic if the implementation of [`Ord`] for `K` does not implement a [total order].
///
/// # Examples
///
/// ```
- /// let mut v = [-5i32, 4, 1, -3, 2];
+ /// let mut v = [4i32, -5, 1, -3, 2];
///
/// v.sort_unstable_by_key(|k| k.abs());
- /// assert!(v == [1, 2, -3, 4, -5]);
+ /// assert_eq!(v, [1, 2, -3, 4, -5]);
/// ```
///
/// [ipnsort]: https://github.com/Voultapher/sort-research-rs/tree/main/ipnsort
+ /// [total order]: https://en.wikipedia.org/wiki/Total_order
#[stable(feature = "sort_unstable", since = "1.20.0")]
#[inline]
pub fn sort_unstable_by_key<K, F>(&mut self, mut f: F)
@@ -3042,15 +3052,14 @@ impl<T> [T] {
/// Median of Medians using Tukey's Ninther for pivot selection, which guarantees linear runtime
/// for all inputs.
///
- /// It is typically faster than stable sorting, except in a few special cases, e.g., when the
- /// slice is nearly fully sorted, where `slice::sort` may be faster.
- ///
/// [`sort_unstable`]: slice::sort_unstable
///
/// # Panics
///
/// Panics when `index >= len()`, meaning it always panics on empty slices.
///
+ /// May panic if the implementation of [`Ord`] for `T` does not implement a [total order].
+ ///
/// # Examples
///
/// ```
@@ -3073,6 +3082,7 @@ impl<T> [T] {
/// ```
///
/// [ipnsort]: https://github.com/Voultapher/sort-research-rs/tree/main/ipnsort
+ /// [total order]: https://en.wikipedia.org/wiki/Total_order
#[stable(feature = "slice_select_nth_unstable", since = "1.49.0")]
#[inline]
pub fn select_nth_unstable(&mut self, index: usize) -> (&mut [T], &mut T, &mut [T])
@@ -3103,15 +3113,14 @@ impl<T> [T] {
/// Median of Medians using Tukey's Ninther for pivot selection, which guarantees linear runtime
/// for all inputs.
///
- /// It is typically faster than stable sorting, except in a few special cases, e.g., when the
- /// slice is nearly fully sorted, where `slice::sort` may be faster.
- ///
/// [`sort_unstable`]: slice::sort_unstable
///
/// # Panics
///
/// Panics when `index >= len()`, meaning it always panics on empty slices.
///
+ /// May panic if `compare` does not implement a [total order].
+ ///
/// # Examples
///
/// ```
@@ -3134,6 +3143,7 @@ impl<T> [T] {
/// ```
///
/// [ipnsort]: https://github.com/Voultapher/sort-research-rs/tree/main/ipnsort
+ /// [total order]: https://en.wikipedia.org/wiki/Total_order
#[stable(feature = "slice_select_nth_unstable", since = "1.49.0")]
#[inline]
pub fn select_nth_unstable_by<F>(
@@ -3168,15 +3178,14 @@ impl<T> [T] {
/// Median of Medians using Tukey's Ninther for pivot selection, which guarantees linear runtime
/// for all inputs.
///
- /// It is typically faster than stable sorting, except in a few special cases, e.g., when the
- /// slice is nearly fully sorted, where `slice::sort` may be faster.
- ///
/// [`sort_unstable`]: slice::sort_unstable
///
/// # Panics
///
/// Panics when `index >= len()`, meaning it always panics on empty slices.
///
+ /// May panic if `K: Ord` does not implement a total order.
+ ///
/// # Examples
///
/// ```
@@ -3199,6 +3208,7 @@ impl<T> [T] {
/// ```
///
/// [ipnsort]: https://github.com/Voultapher/sort-research-rs/tree/main/ipnsort
+ /// [total order]: https://en.wikipedia.org/wiki/Total_order
#[stable(feature = "slice_select_nth_unstable", since = "1.49.0")]
#[inline]
pub fn select_nth_unstable_by_key<K, F>(
diff --git a/library/core/src/slice/sort/shared/smallsort.rs b/library/core/src/slice/sort/shared/smallsort.rs
index 5111ed8756bf1..e168e8a4478b8 100644
--- a/library/core/src/slice/sort/shared/smallsort.rs
+++ b/library/core/src/slice/sort/shared/smallsort.rs
@@ -834,9 +834,9 @@ unsafe fn bidirectional_merge<T: FreezeMarker, F: FnMut(&T, &T) -> bool>(
right = right.add((!left_nonempty) as usize);
}
- // We now should have consumed the full input exactly once. This can
- // only fail if the comparison operator fails to be Ord, in which case
- // we will panic and never access the inconsistent state in dst.
+ // We now should have consumed the full input exactly once. This can only fail if the
+ // user-provided comparison function fails to implement a strict weak ordering. In that case
+ // we panic and never access the inconsistent state in dst.
if left != left_end || right != right_end {
panic_on_ord_violation();
}
@@ -845,7 +845,21 @@ unsafe fn bidirectional_merge<T: FreezeMarker, F: FnMut(&T, &T) -> bool>(
#[inline(never)]
fn panic_on_ord_violation() -> ! {
- panic!("Ord violation");
+ // This is indicative of a logic bug in the user-provided comparison function or Ord
+ // implementation. They are expected to implement a total order as explained in the Ord
+ // documentation.
+ //
+ // By panicking we inform the user, that they have a logic bug in their program. If a strict
+ // weak ordering is not given, the concept of comparison based sorting cannot yield a sorted
+ // result. E.g.: a < b < c < a
+ //
+ // The Ord documentation requires users to implement a total order. Arguably that's
+ // unnecessarily strict in the context of sorting. Issues only arise if the weaker requirement
+ // of a strict weak ordering is violated.
+ //
+ // The panic message talks about a total order because that's what the Ord documentation talks
+ // about and requires, so as to not confuse users.
+ panic!("user-provided comparison function does not correctly implement a total order");
}
#[must_use]
diff --git a/library/core/src/slice/sort/unstable/mod.rs b/library/core/src/slice/sort/unstable/mod.rs
index 692c2d8f7c7ba..17aa3994bf20d 100644
--- a/library/core/src/slice/sort/unstable/mod.rs
+++ b/library/core/src/slice/sort/unstable/mod.rs
@@ -9,7 +9,7 @@ use crate::slice::sort::shared::smallsort::insertion_sort_shift_left;
pub(crate) mod heapsort;
pub(crate) mod quicksort;
-/// Unstable sort called ipnsort by Lukas Bergdoll.
+/// Unstable sort called ipnsort by Lukas Bergdoll and Orson Peters.
/// Design document:
/// <https://github.com/Voultapher/sort-research-rs/blob/main/writeup/ipnsort_introduction/text.md>
///
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs
index 2cd9b6fcd387e..4dd065f568087 100644
--- a/src/librustdoc/clean/mod.rs
+++ b/src/librustdoc/clean/mod.rs
@@ -285,17 +285,10 @@ fn clean_lifetime<'tcx>(lifetime: &hir::Lifetime, cx: &mut DocContext<'tcx>) ->
}
pub(crate) fn clean_const<'tcx>(
- constant: &hir::ConstArg<'tcx>,
+ constant: &hir::ConstArg<'_>,
_cx: &mut DocContext<'tcx>,
) -> Constant {
- match &constant.kind {
- hir::ConstArgKind::Path(qpath) => {
- Constant { kind: ConstantKind::Path { path: qpath_to_string(&qpath).into() } }
- }
- hir::ConstArgKind::Anon(anon) => {
- Constant { kind: ConstantKind::Anonymous { body: anon.body } }
- }
- }
+ Constant { kind: ConstantKind::Anonymous { body: constant.value.body } }
}
pub(crate) fn clean_middle_const<'tcx>(
@@ -438,7 +431,7 @@ fn clean_hir_term<'tcx>(term: &hir::Term<'tcx>, cx: &mut DocContext<'tcx>) -> Te
match term {
hir::Term::Ty(ty) => Term::Type(clean_ty(ty, cx)),
hir::Term::Const(c) => Term::Constant(clean_middle_const(
- ty::Binder::dummy(ty::Const::from_const_arg(cx.tcx, c, ty::FeedConstTy::No)),
+ ty::Binder::dummy(ty::Const::from_anon_const(cx.tcx, c.def_id)),
cx,
)),
}
@@ -634,9 +627,8 @@ fn clean_generic_param<'tcx>(
param.name.ident().name,
GenericParamDefKind::Const {
ty: Box::new(clean_ty(ty, cx)),
- default: default.map(|ct| {
- Box::new(ty::Const::from_const_arg(cx.tcx, ct, ty::FeedConstTy::No).to_string())
- }),
+ default: default
+ .map(|ct| Box::new(ty::Const::from_anon_const(cx.tcx, ct.def_id).to_string())),
synthetic,
},
),
@@ -1822,7 +1814,7 @@ pub(crate) fn clean_ty<'tcx>(ty: &hir::Ty<'tcx>, cx: &mut DocContext<'tcx>) -> T
TyKind::Array(ty, ref length) => {
let length = match length {
hir::ArrayLen::Infer(..) => "_".to_string(),
- hir::ArrayLen::Body(const_arg) => {
+ hir::ArrayLen::Body(anon_const) => {
// NOTE(min_const_generics): We can't use `const_eval_poly` for constants
// as we currently do not supply the parent generics to anonymous constants
// but do allow `ConstKind::Param`.
@@ -1830,18 +1822,9 @@ pub(crate) fn clean_ty<'tcx>(ty: &hir::Ty<'tcx>, cx: &mut DocContext<'tcx>) -> T
// `const_eval_poly` tries to first substitute generic parameters which
// results in an ICE while manually constructing the constant and using `eval`
// does nothing for `ConstKind::Param`.
- let ct = ty::Const::from_const_arg(cx.tcx, const_arg, ty::FeedConstTy::No);
- let ct = if let hir::ConstArgKind::Anon(hir::AnonConst { def_id, .. }) =
- const_arg.kind
- {
- // Only anon consts can implicitly capture params.
- // FIXME: is this correct behavior?
- let param_env = cx.tcx.param_env(*def_id);
- ct.normalize(cx.tcx, param_env)
- } else {
- ct
- };
- print_const(cx, ct)
+ let ct = ty::Const::from_anon_const(cx.tcx, anon_const.def_id);
+ let param_env = cx.tcx.param_env(anon_const.def_id);
+ print_const(cx, ct.normalize(cx.tcx, param_env))
}
};
diff --git a/src/librustdoc/clean/types.rs b/src/librustdoc/clean/types.rs
index 3709953159686..a31adc9949a3f 100644
--- a/src/librustdoc/clean/types.rs
+++ b/src/librustdoc/clean/types.rs
@@ -2395,9 +2395,6 @@ pub(crate) enum ConstantKind {
/// Note that `ty::Const` includes generic parameters, and may not always be uniquely identified
/// by a DefId. So this field must be different from `Extern`.
TyConst { expr: Box<str> },
- /// A constant that is just a path (i.e., referring to a const param, free const, etc.).
- // FIXME: this is an unfortunate representation. rustdoc's logic around consts needs to be improved.
- Path { path: Box<str> },
/// A constant (expression) that's not an item or associated item. These are usually found
/// nested inside types (e.g., array lengths) or expressions (e.g., repeat counts), and also
/// used to define explicit discriminant values for enum variants.
@@ -2426,7 +2423,6 @@ impl ConstantKind {
pub(crate) fn expr(&self, tcx: TyCtxt<'_>) -> String {
match *self {
ConstantKind::TyConst { ref expr } => expr.to_string(),
- ConstantKind::Path { ref path } => path.to_string(),
ConstantKind::Extern { def_id } => print_inlined_const(tcx, def_id),
ConstantKind::Local { body, .. } | ConstantKind::Anonymous { body } => {
rendered_const(tcx, tcx.hir().body(body), tcx.hir().body_owner_def_id(body))
@@ -2436,9 +2432,7 @@ impl ConstantKind {
pub(crate) fn value(&self, tcx: TyCtxt<'_>) -> Option<String> {
match *self {
- ConstantKind::TyConst { .. }
- | ConstantKind::Path { .. }
- | ConstantKind::Anonymous { .. } => None,
+ ConstantKind::TyConst { .. } | ConstantKind::Anonymous { .. } => None,
ConstantKind::Extern { def_id } | ConstantKind::Local { def_id, .. } => {
print_evaluated_const(tcx, def_id, true, true)
}
@@ -2447,9 +2441,7 @@ impl ConstantKind {
pub(crate) fn is_literal(&self, tcx: TyCtxt<'_>) -> bool {
match *self {
- ConstantKind::TyConst { .. }
- | ConstantKind::Extern { .. }
- | ConstantKind::Path { .. } => false,
+ ConstantKind::TyConst { .. } | ConstantKind::Extern { .. } => false,
ConstantKind::Local { body, .. } | ConstantKind::Anonymous { body } => {
is_literal_expr(tcx, body.hir_id)
}
diff --git a/src/stage0 b/src/stage0
index f36010fa4b459..a492fef602fbb 100644
--- a/src/stage0
+++ b/src/stage0
@@ -14,434 +14,336 @@ nightly_branch=master
# All changes below this comment will be overridden the next time the
# tool is executed.
-compiler_date=2024-06-11
-compiler_version=beta
-rustfmt_date=2024-06-11
-rustfmt_version=nightly
+compiler_date=2024-08-08
+compiler_version=1.80.1
-dist/2024-06-11/rustc-beta-x86_64-unknown-freebsd.tar.gz=4bf5a3ae2656a992beedec2f41dc98c791426a1a6a88f3503b003b4d6f0ddc1f
-dist/2024-06-11/rustc-beta-x86_64-unknown-freebsd.tar.xz=feaa1484586e78d77225734328d460277dde14baaf1299a30b30ef91e9a26a82
-dist/2024-06-11/rustc-beta-x86_64-unknown-illumos.tar.gz=9c692a71916f7ca9d41a97416f51d463b0495311491ba92b4d3cdb0f6c4e7c87
-dist/2024-06-11/rustc-beta-x86_64-unknown-illumos.tar.xz=97dece0cc2e4856a49f9ae17f09171fb55f140987acd0f988bbd0aa1e8971936
-dist/2024-06-11/rustc-beta-armv7-unknown-linux-gnueabihf.tar.gz=6ad2e87e637302e8458d47dc1af923e38bffd7332775cfa5520c29110594d9b9
-dist/2024-06-11/rustc-beta-armv7-unknown-linux-gnueabihf.tar.xz=84f6755c1377ced8ed2700b5ca9a2d38dd2e26a03e1fd636841ad46d3cf63895
-dist/2024-06-11/rustc-beta-i686-unknown-linux-gnu.tar.gz=11b439045379be2722cb42409b8bc342ff4b5f7df85e42566006cd72bb1a4e8a
-dist/2024-06-11/rustc-beta-i686-unknown-linux-gnu.tar.xz=4e5103702b4e43ea71914e9c508aeb0db6382ea331c31981142163b2a89e19e1
-dist/2024-06-11/rustc-beta-powerpc-unknown-linux-gnu.tar.gz=396a3aaefca9511086f7e5442209b70622082d133b96783b4237c3f01f42bf87
-dist/2024-06-11/rustc-beta-powerpc-unknown-linux-gnu.tar.xz=66e46ed344af9f165b7c4fde2c576340fa81ecade61c45ecc1562de70a9203da
-dist/2024-06-11/rustc-beta-aarch64-unknown-linux-gnu.tar.gz=831420b262c5a2f44459e0daceebe271f298179c37aa5b7a1704a15bbbb1fb97
-dist/2024-06-11/rustc-beta-aarch64-unknown-linux-gnu.tar.xz=691a6c4d0276add72cfab40968520ff48f683d4e660a50d1626ba9564dbf4914
-dist/2024-06-11/rustc-beta-aarch64-unknown-linux-musl.tar.gz=ebe1efe3c5d74e37d1c40dbd585ada7a7e256ce76911746f54994dfa15f9907f
-dist/2024-06-11/rustc-beta-aarch64-unknown-linux-musl.tar.xz=3bb37fcab069713fe8aa5ca72291a439eba5af4a3cc0be9d152e5f29ccaef864
-dist/2024-06-11/rustc-beta-s390x-unknown-linux-gnu.tar.gz=c00c2ecb5aae552069395d03f4135f051da073efc68ed645348f026c1884799b
-dist/2024-06-11/rustc-beta-s390x-unknown-linux-gnu.tar.xz=2c72347688058091a4bcb0c2fbcff49020df2b2c1733bc19d93b6e5149d5b13a
-dist/2024-06-11/rustc-beta-aarch64-pc-windows-msvc.tar.gz=517977edaa51470d460aa9ec09309eea2082cffa6adb13571a8f36efa9351dff
-dist/2024-06-11/rustc-beta-aarch64-pc-windows-msvc.tar.xz=0cc0b740cb267fde814b4971591b5797faa528b1e6250ef7b2d5220f0916208d
-dist/2024-06-11/rustc-beta-x86_64-pc-windows-gnu.tar.gz=9fe7d85fdbca12fbfdb776789c336f726303c8845a6f6c93b2dc6ea8487585d4
-dist/2024-06-11/rustc-beta-x86_64-pc-windows-gnu.tar.xz=38130e3d9779ad54bd890c4001b34b7c58368ed1940e7e676947e9c05a8f6649
-dist/2024-06-11/rustc-beta-arm-unknown-linux-gnueabihf.tar.gz=acca3e045de3c0d908caec4249e3905d207d96b4a1722644457b3cbe5707422c
-dist/2024-06-11/rustc-beta-arm-unknown-linux-gnueabihf.tar.xz=e4e92fc4b672f72b1f03db62ae712d9f944b982db89cf0d8dcb94adb1d560b3e
-dist/2024-06-11/rustc-beta-riscv64gc-unknown-linux-gnu.tar.gz=63274e707bd0d2b2f08c49f170f26773f802db833347d2aa694d345d11c841f5
-dist/2024-06-11/rustc-beta-riscv64gc-unknown-linux-gnu.tar.xz=13702b24228d983710d5678e0a1003e4f77e2244fbdf599015f52adbbb77bfcc
-dist/2024-06-11/rustc-beta-x86_64-pc-windows-msvc.tar.gz=ca877491bf7bf50989b9ac21c12e335fd0ff002ccf4a2c07316ae1df1a3d7e6b
-dist/2024-06-11/rustc-beta-x86_64-pc-windows-msvc.tar.xz=d757a328595887039d8017e9e3faf79448850c3dd9bd3c26d309a313ccc09a38
-dist/2024-06-11/rustc-beta-x86_64-unknown-linux-musl.tar.gz=155497f2abe036f09f6aa014969d58132a9e2e4e148fea485b483e0dc3705a39
-dist/2024-06-11/rustc-beta-x86_64-unknown-linux-musl.tar.xz=6204d1fa08beeadcf1564e334cbb65a7317c571557cbc5517eb6bf08f5b0ce75
-dist/2024-06-11/rustc-beta-aarch64-apple-darwin.tar.gz=3bd7db536344c6a3d0d0bdf95986136d5db8996228802444b561783f2e7c3c9c
-dist/2024-06-11/rustc-beta-aarch64-apple-darwin.tar.xz=b425561b3e7d9130fae94e78522bb262c634304ced32030828743fb332b11ecb
-dist/2024-06-11/rustc-beta-x86_64-unknown-linux-gnu.tar.gz=e2f78198d33f98aa34bedd4f5920868a8f68620e29eca2917833f6a8f23f787c
-dist/2024-06-11/rustc-beta-x86_64-unknown-linux-gnu.tar.xz=22f3b45678081fe52a9c8e89234a9939aad5623eb43ec54921effc28c0bdcd80
-dist/2024-06-11/rustc-beta-powerpc64le-unknown-linux-gnu.tar.gz=beb5ec95069cbac4e53c51ea3e785ab5f25122132c8b78b196372bb2a31ed46f
-dist/2024-06-11/rustc-beta-powerpc64le-unknown-linux-gnu.tar.xz=17242f74c96cf581f2e40a82f6d7fbd585af2c2990cc73ad4ba7a3503dd279a3
-dist/2024-06-11/rustc-beta-x86_64-apple-darwin.tar.gz=d952d90397c70c5b53caa98b2e5d48e35780e1e5b342775c10fcbf504717d2ec
-dist/2024-06-11/rustc-beta-x86_64-apple-darwin.tar.xz=14bd4336eb396a133ddbb2acd01ae799f2f68a7ac723a00a9db8c3e06bfa8027
-dist/2024-06-11/rustc-beta-loongarch64-unknown-linux-gnu.tar.gz=a2118f80091d62ebb762df0bdd159d19befb440d754034da7348aae50d63628f
-dist/2024-06-11/rustc-beta-loongarch64-unknown-linux-gnu.tar.xz=a4b9d1a04d8f9cfd4daaf57fbeed3615d000c5107c6fa1b2992dad6ca552e35a
-dist/2024-06-11/rustc-beta-powerpc64-unknown-linux-gnu.tar.gz=d5c16c5621e43cd3007ba4d2bc0f6e8a3a2376bc2a911e42bd2f2670ff94c12c
-dist/2024-06-11/rustc-beta-powerpc64-unknown-linux-gnu.tar.xz=202662492afd863b6b6428a3bc5ed822c62ac2aeb8a0264df1d69cc5a3728d8f
-dist/2024-06-11/rustc-beta-i686-pc-windows-msvc.tar.gz=a9fb64cac53595444bdbe8f152e52214812498e0c6e2b664db10f1f693a92dca
-dist/2024-06-11/rustc-beta-i686-pc-windows-msvc.tar.xz=fe78c5ac51d96c3c3e222828dca3d105a2d4d7f8acd6e0d86ecd4b27ea70a4c3
-dist/2024-06-11/rustc-beta-arm-unknown-linux-gnueabi.tar.gz=8c584010c964ef1b02e1014ca1c6ed9584c1ff781f8af115ee001e3a13213954
-dist/2024-06-11/rustc-beta-arm-unknown-linux-gnueabi.tar.xz=4a407fb59db284ddf6fc0ccd487116fafbcd7c227f3dfd4e0b7b64dd560dc113
-dist/2024-06-11/rustc-beta-x86_64-unknown-netbsd.tar.gz=2f07a283bb0e57ad50366b67d216503a423867eae205e4354b74b748e9d3ce85
-dist/2024-06-11/rustc-beta-x86_64-unknown-netbsd.tar.xz=8008331b32e9d0daeb275327082e38671dcc91864a3ac95be67bd15ecaa852ad
-dist/2024-06-11/rustc-beta-i686-pc-windows-gnu.tar.gz=c42637a8aa8666d746a45c9f47b437a9720d355b5bc6db42c2a90fb03d2c4a26
-dist/2024-06-11/rustc-beta-i686-pc-windows-gnu.tar.xz=eabe3a7e72829e0e5904ef381157cc3da169d9f5942e0367b2d1b1781c387560
-dist/2024-06-11/rust-std-beta-x86_64-unknown-linux-musl.tar.gz=f4010eea815cbab895c96311a456c4e3aa24c5f0d55f09052bcde59de7f286e6
-dist/2024-06-11/rust-std-beta-x86_64-unknown-linux-musl.tar.xz=a8f555c713cbe4a1860ee5bc812eb624f2775e034da54bd0e37c325453d70448
-dist/2024-06-11/rust-std-beta-aarch64-unknown-linux-musl.tar.gz=c89619ed4ec28d4f48ef2f7e51155716483a7f4bb51fe38235e69d4694cfcbe5
-dist/2024-06-11/rust-std-beta-aarch64-unknown-linux-musl.tar.xz=89aa3d1add14298bd40e3bcbc6b41df91312258ac6f203fff9eca4422f0c5e9f
-dist/2024-06-11/rust-std-beta-x86_64-apple-darwin.tar.gz=2303e7926bcc4fa2c67c7063fcac3a7b581fdd91fb89123cb6cdf514ff38afed
-dist/2024-06-11/rust-std-beta-x86_64-apple-darwin.tar.xz=9ddf392d8c696e902c2924ff938a4bd099b9a54834dc62710e42527e464e776f
-dist/2024-06-11/rust-std-beta-x86_64-pc-windows-msvc.tar.gz=6016b465a0cfc628f2c978ed18bc19a4a27e20a5ac11a170c40d01a857a5f50a
-dist/2024-06-11/rust-std-beta-x86_64-pc-windows-msvc.tar.xz=8e3d6f7ef6efead7d08b1c889bcc6e520d0a6d29226ade1b150aeb625fdb9abd
-dist/2024-06-11/rust-std-beta-x86_64-unknown-linux-gnux32.tar.gz=5f53b7630fa7703fc6752c3fb8c8eba8e25b9f77a3b91e14982510a0091d9e44
-dist/2024-06-11/rust-std-beta-x86_64-unknown-linux-gnux32.tar.xz=8ed3c2f0b0f81d197d0dbd01aa777eb17ebc7303176601be2b2b05ebe1bcc971
-dist/2024-06-11/rust-std-beta-loongarch64-unknown-none-softfloat.tar.gz=dbc1a1bb8cfb4472739d7f3a52bcd571357d2d2761f3723aa4c7d69abe9a5dfc
-dist/2024-06-11/rust-std-beta-loongarch64-unknown-none-softfloat.tar.xz=58f46f20d58669d497ff683d6ea85e18ff68d51a442f6e21bc20ddee779e1c4f
-dist/2024-06-11/rust-std-beta-riscv64gc-unknown-linux-gnu.tar.gz=d71947b5ddcfe538162b14d6b785c365c34f2b6ac2f1abdc90b020c4a446a313
-dist/2024-06-11/rust-std-beta-riscv64gc-unknown-linux-gnu.tar.xz=ca0a665e566b3ff74c5f552e7e4e030d3cae9080dbb6055dce3aa41206b5b111
-dist/2024-06-11/rust-std-beta-x86_64-unknown-fuchsia.tar.gz=e927c0890d2c5135d86b1960b6b182d5c47853b53eeb196b4748e7b8ec9362e4
-dist/2024-06-11/rust-std-beta-x86_64-unknown-fuchsia.tar.xz=df33672f826ce8681d6c18ec2129ef47623b7cbaf6515cd921d39dfc05cb7a06
-dist/2024-06-11/rust-std-beta-i686-linux-android.tar.gz=2559fdcf250e7e0a1b5589e8f2bc69340f5610b7e6ddf08185936fa2e6f10534
-dist/2024-06-11/rust-std-beta-i686-linux-android.tar.xz=442f0aa53f343eec2b6984934bbf0651ff45f314d1f46dad2aa11a2f5c5a5a5b
-dist/2024-06-11/rust-std-beta-thumbv7neon-linux-androideabi.tar.gz=cb657852d05766e1c18b11d99a94f3570b6c6147dbf9b2113b80236566d2d4ac
-dist/2024-06-11/rust-std-beta-thumbv7neon-linux-androideabi.tar.xz=943de72c556821b67d59afd9dd128bfb01b3ba743dd3e7561c50559afd3768f4
-dist/2024-06-11/rust-std-beta-thumbv7neon-unknown-linux-gnueabihf.tar.gz=a7c6d3f54d925be073007e3737173b0def7d781b6bfd5345971a69300aeee9c3
-dist/2024-06-11/rust-std-beta-thumbv7neon-unknown-linux-gnueabihf.tar.xz=cb9115328bf6f5ae661ce5bc9cc9165c6c9e6f759f3cc5038154531b314e6013
-dist/2024-06-11/rust-std-beta-riscv32imac-unknown-none-elf.tar.gz=2a2dac9fba84958818f6b31f30f91fcfef521111827937c88aa696b646f5b075
-dist/2024-06-11/rust-std-beta-riscv32imac-unknown-none-elf.tar.xz=d16b28da0196a815f028d432dfa0957d0bfb512b259129969548bd050afac872
-dist/2024-06-11/rust-std-beta-armv7a-none-eabi.tar.gz=d78f96102490f9025598b11cb72e31e96d3f5fd566e8f7b2b2c503a37b0dc6c3
-dist/2024-06-11/rust-std-beta-armv7a-none-eabi.tar.xz=a439af58e90970b4dadaa04d8f94ea53c6c7a159117926c46b7da0eaa0d0ca5b
-dist/2024-06-11/rust-std-beta-i686-pc-windows-msvc.tar.gz=d7847f3d9b1a2f50541ef3d2c25eeda469b28412817cadca52756aeb4f2c57b1
-dist/2024-06-11/rust-std-beta-i686-pc-windows-msvc.tar.xz=622cafc347ec1d3f0ef70354a0713cd255029730b17ad1f1ee951d9b0cb515e5
-dist/2024-06-11/rust-std-beta-x86_64-pc-windows-gnullvm.tar.gz=5fee2542ee8ee8d155edc0ac36ec8822896e6f93f9f573b9284d70aeb186a05d
-dist/2024-06-11/rust-std-beta-x86_64-pc-windows-gnullvm.tar.xz=dfe9ca3e3f217922b65db0d65826c0962369fefd3d5d72d6f03039acd710f122
-dist/2024-06-11/rust-std-beta-x86_64-unknown-linux-gnu.tar.gz=b0937c5dcd458f313aabe07668ea338f2629bfc9c45d6139211b6923a7c7eb0e
-dist/2024-06-11/rust-std-beta-x86_64-unknown-linux-gnu.tar.xz=65973a26c69f8ca7d3022180e2729161f7a618706cd9974fc54b14cf48f1af79
-dist/2024-06-11/rust-std-beta-aarch64-unknown-none.tar.gz=def2fc3aca20a74d023156606067f88ea8f1c8b602fb628b8f27ee43e3b62cfd
-dist/2024-06-11/rust-std-beta-aarch64-unknown-none.tar.xz=43cdb54af35a6c00ee10759a3f6ff6ca5c9080ba817aaf2eab7df8f239d77196
-dist/2024-06-11/rust-std-beta-powerpc64le-unknown-linux-gnu.tar.gz=ae2cbe53d304442e112585dd968f72454cc33bb75d3b4d7854a04575ff7b5301
-dist/2024-06-11/rust-std-beta-powerpc64le-unknown-linux-gnu.tar.xz=b3192290a45ff978126f4f08e7ddaf6de8720a2f6abbc5b41536fad6f994d7ae
-dist/2024-06-11/rust-std-beta-powerpc-unknown-linux-gnu.tar.gz=0e2dc167dbb66366252100fc87b94a67cca3360343302697c2989beb2eb14704
-dist/2024-06-11/rust-std-beta-powerpc-unknown-linux-gnu.tar.xz=6144604269f533eed11471b4c5d2f31a9f8340d9edf0f398a42e6e970c95b991
-dist/2024-06-11/rust-std-beta-riscv32i-unknown-none-elf.tar.gz=b57e11248924ac54500d80525b8fe823e7dc74bc579c2b7f3f076c0a4c85ee2a
-dist/2024-06-11/rust-std-beta-riscv32i-unknown-none-elf.tar.xz=9e473a5de0d02e6d8278a9e2430af135e3d6d4ecf5ce59827b384c8f20af39c2
-dist/2024-06-11/rust-std-beta-thumbv8m.main-none-eabihf.tar.gz=1a62b5af52767e68146a45a47384b33c93b32a4579e51d41f66746e38dfa6eba
-dist/2024-06-11/rust-std-beta-thumbv8m.main-none-eabihf.tar.xz=81bcf448ec54470edf60c2079ad9ef03f34052aef5fe9d8f5af933c565fdfd29
-dist/2024-06-11/rust-std-beta-x86_64-pc-windows-gnu.tar.gz=88eb49f86265a7fdb49b455cf5a9a373ac1e0f7cbcac08ef2194eaefbb039b22
-dist/2024-06-11/rust-std-beta-x86_64-pc-windows-gnu.tar.xz=bf9a278615765e199786d16f154006007ddfca0d5a5869c55a05e513a7b06580
-dist/2024-06-11/rust-std-beta-thumbv7em-none-eabihf.tar.gz=13f16402dea66facba6e10a9556e0afdbd6b004e8aa5d08e106cf76ea59b8288
-dist/2024-06-11/rust-std-beta-thumbv7em-none-eabihf.tar.xz=7ecd66dc65758cdf32cdebc38f6f399392788a7085d69ec7e8fbd63be7b3e904
-dist/2024-06-11/rust-std-beta-aarch64-pc-windows-gnullvm.tar.gz=96ccb2252defcd5bcd9eca19380b9d4e4115ffb135efebe6717b1527ee440bf8
-dist/2024-06-11/rust-std-beta-aarch64-pc-windows-gnullvm.tar.xz=c31f4ef95857a445bc480b73babb886e259443b3137efd694c4b67f913838212
-dist/2024-06-11/rust-std-beta-thumbv7em-none-eabi.tar.gz=0637fe1ab1284334ed4f9aec87a4b51b6983418997844e10ffe20326078f6d18
-dist/2024-06-11/rust-std-beta-thumbv7em-none-eabi.tar.xz=ac7f13ba1a107d03c1b7bb0d2e6753b926a26554c82de38263113e2d5dfeca21
-dist/2024-06-11/rust-std-beta-s390x-unknown-linux-gnu.tar.gz=0e8a21970d4ea6331968b10e990cb6dbe3d38af393e4dc8d603efec1b59aa0bd
-dist/2024-06-11/rust-std-beta-s390x-unknown-linux-gnu.tar.xz=04b9663cef2d3507c96b77b18aff7c9beee0f6bd0e0cb9ef37b8c9cacadbb198
-dist/2024-06-11/rust-std-beta-wasm32-unknown-emscripten.tar.gz=01d4da0efebf4615da7c92c6cfdaedaf283d3f5e66c58a1b1e2e17488d86b3d3
-dist/2024-06-11/rust-std-beta-wasm32-unknown-emscripten.tar.xz=c203ec9216407f90d0bcc451e40a29e50279dae8ee161f05d9245e3cc8e1b30a
-dist/2024-06-11/rust-std-beta-armv7-unknown-linux-gnueabi.tar.gz=3621e0a16f7e6d9f292894a343941399a54b5d76a858fe5a69b83c95f15ada07
-dist/2024-06-11/rust-std-beta-armv7-unknown-linux-gnueabi.tar.xz=5944208b88c6924f8586304abea6827cdf756066158dc64200e207027143e843
-dist/2024-06-11/rust-std-beta-aarch64-unknown-uefi.tar.gz=1887e342d5c6453a63336023e51c124838762f89e9289d1abd8226a717bb96d3
-dist/2024-06-11/rust-std-beta-aarch64-unknown-uefi.tar.xz=ba0ca831ed66a72a14c8c9dd591e97d7d6cbc55762c961283088e897de4a8669
-dist/2024-06-11/rust-std-beta-aarch64-unknown-fuchsia.tar.gz=59790fb6982ebfefc40d352d411604840b7540a6ddfb26ad14d70e139df3ab99
-dist/2024-06-11/rust-std-beta-aarch64-unknown-fuchsia.tar.xz=c022c80da2debecdbea32ce34ef040bdebc8566a78e2867512815532746e1c95
-dist/2024-06-11/rust-std-beta-armebv7r-none-eabihf.tar.gz=4d4a380bed233e86ea957c173412b819fce00d66d369657a0778da5e4f244034
-dist/2024-06-11/rust-std-beta-armebv7r-none-eabihf.tar.xz=577763a4758c42bcf0c875d606a6dd538c07866e9a65c2b73271f0e9d0762830
-dist/2024-06-11/rust-std-beta-i586-unknown-linux-gnu.tar.gz=29f8e4dc5d88bfd66f600402022267ad85d4afcffd7142107d0fd28d0cae4cd8
-dist/2024-06-11/rust-std-beta-i586-unknown-linux-gnu.tar.xz=d030db59dd1788fa8438c52b9a8cbc6754eaf529de60fa4fa9693a687e644dfb
-dist/2024-06-11/rust-std-beta-sparc64-unknown-linux-gnu.tar.gz=df978c1519ea4b50fcec2ec18d2cd9a6b813982dc50f6442af9ce340b98a8c46
-dist/2024-06-11/rust-std-beta-sparc64-unknown-linux-gnu.tar.xz=13585b56ce162922dbf03d0b6432a6af9b9059a664063a6adca957301c23b905
-dist/2024-06-11/rust-std-beta-wasm32-unknown-unknown.tar.gz=6365c96d363a345c4882ad47a3e9242f37c930a10bdc89d137e5e05b1b599351
-dist/2024-06-11/rust-std-beta-wasm32-unknown-unknown.tar.xz=480e07d3f110ff9f201315f5a01bf674ead911773241d80d9005772cfe4a3d88
-dist/2024-06-11/rust-std-beta-armv7r-none-eabi.tar.gz=0514e7022540078895be3000fa0405157bf1165762e77672f78230e62ef2c8ec
-dist/2024-06-11/rust-std-beta-armv7r-none-eabi.tar.xz=659cec4d3e3f0783bf9a8b42a245b995e00b36a8ff04a9b6b458ace016d825d1
-dist/2024-06-11/rust-std-beta-i686-pc-windows-gnu.tar.gz=2c6b17e0fa22a9d528217fdb8231aefd21839e29babad0fd975fd3654a9706f2
-dist/2024-06-11/rust-std-beta-i686-pc-windows-gnu.tar.xz=c2c98b0c6b21618d5c49283f19ccdd3ba76159afd904c9683251d36317582615
-dist/2024-06-11/rust-std-beta-x86_64-pc-solaris.tar.gz=9433aed1f5f87157cf02d13e7ad375e9a2e9a260afb8419a05eeb1856069ab26
-dist/2024-06-11/rust-std-beta-x86_64-pc-solaris.tar.xz=2a39a792676fd60f47db90979fd56f3fee709d05d91b5c8bf4e0a01f39fed14e
-dist/2024-06-11/rust-std-beta-x86_64-unknown-linux-ohos.tar.gz=29e4553e9889c3e202f550042555b5c24cf52ce68979870fe33d9e9eaad37db0
-dist/2024-06-11/rust-std-beta-x86_64-unknown-linux-ohos.tar.xz=7d56ef2eb64550f95b2ec1e1cfb9f153e9c6b412dcceef35f76db44eccd4d8a1
-dist/2024-06-11/rust-std-beta-i586-pc-windows-msvc.tar.gz=da7c08348c6834793263e136747e0e3dfcd5cd805c0c6ca25323fab8a30de427
-dist/2024-06-11/rust-std-beta-i586-pc-windows-msvc.tar.xz=3d60ea1671800cb8f271f1869186ed099f35ee8171d23df7c6ef0c79b4567540
-dist/2024-06-11/rust-std-beta-riscv32im-unknown-none-elf.tar.gz=f3cfa8625f3586ddf48c301b7016d49d216324daaa3b76168a97f15506346c3a
-dist/2024-06-11/rust-std-beta-riscv32im-unknown-none-elf.tar.xz=2e5388097f10a3640514d1a4040f6fec090e1c4aba0259cbdd900ead7fcdfd94
-dist/2024-06-11/rust-std-beta-i686-unknown-freebsd.tar.gz=cf38eeced5efe6139043e123b217a5c3f43bef3d86001a9a51fa21b012c9b468
-dist/2024-06-11/rust-std-beta-i686-unknown-freebsd.tar.xz=e078625da24308d78603400e96454e60606bed23f1132b64efbbbc815791d58c
-dist/2024-06-11/rust-std-beta-aarch64-apple-ios.tar.gz=2f1dcaa67df6adacbb850bf17ed5df8258fd2087668d028814874fc8292bf420
-dist/2024-06-11/rust-std-beta-aarch64-apple-ios.tar.xz=2a11e0abb8b162a12f72825cac59cc0df993b5582d911bdf6b97252078887651
-dist/2024-06-11/rust-std-beta-riscv64imac-unknown-none-elf.tar.gz=d7f4366df7f3599f031b9654d3c0bebd9c21ec530330283e6560cceccc17365b
-dist/2024-06-11/rust-std-beta-riscv64imac-unknown-none-elf.tar.xz=cb9e8470fd9934870cbb881f7611a0bd614416faa42cfa6096a1ed19abdf9cac
-dist/2024-06-11/rust-std-beta-wasm32-wasi.tar.gz=5e7d7b535a7c1449a4dcac4022de279c7676852a7da3e63dc063595dd3fa1b54
-dist/2024-06-11/rust-std-beta-wasm32-wasi.tar.xz=c4db5ad4aa261a01ba3fd8a191c7ac6323e6134b2e17522b3fe0891a642d4c87
-dist/2024-06-11/rust-std-beta-x86_64-apple-ios.tar.gz=a27f3ff22b233c72673e32bf257f766ad8e11abfaf9f83fc7c3e756f785ee83e
-dist/2024-06-11/rust-std-beta-x86_64-apple-ios.tar.xz=8592a2f8b1d6c3cab199cabe8b6e9a668b90bd77bf6a5e0869e2b4f3cc6d1170
-dist/2024-06-11/rust-std-beta-riscv32imafc-unknown-none-elf.tar.gz=ffd9d5acd9a2a33e6a699b850d1776521da443b52504ba77fc71d6dd7353e18d
-dist/2024-06-11/rust-std-beta-riscv32imafc-unknown-none-elf.tar.xz=e92eec9cd55b37f135237c98cfe00c4ee23d2ef400cc3470deb8f1a0010e94c3
-dist/2024-06-11/rust-std-beta-x86_64-unknown-illumos.tar.gz=b1d2e427120295375eecc3d8fc647fe57e1195210d7d0243b20d156f173c3155
-dist/2024-06-11/rust-std-beta-x86_64-unknown-illumos.tar.xz=b97fe83bb5050460465c57c37456868368d0ce18e5134fedad07ae00df8b7432
-dist/2024-06-11/rust-std-beta-powerpc64-unknown-linux-gnu.tar.gz=25ad2d1a91456394427a5db691ebd903e56e60daa89d73598155655caf6592b6
-dist/2024-06-11/rust-std-beta-powerpc64-unknown-linux-gnu.tar.xz=88b0a7fb002922f78af0f8e9580acdfeb4c341c9fad35e53daf4d6073c73ab8f
-dist/2024-06-11/rust-std-beta-x86_64-unknown-netbsd.tar.gz=b5e129c655bdc051eaa5aca8c8a577914100137a5bca753df619edd22889a1c2
-dist/2024-06-11/rust-std-beta-x86_64-unknown-netbsd.tar.xz=5fc42453c00c3498af2fd60fa4345c2047f302113666bf4a1d044539e3c1e66d
-dist/2024-06-11/rust-std-beta-thumbv8m.main-none-eabi.tar.gz=afb1e9e37af72ba42b71f2a8a78ef7ba8593dbf8e35501e20a81e2aae204722e
-dist/2024-06-11/rust-std-beta-thumbv8m.main-none-eabi.tar.xz=3b7f63b544a5e8aad8a18097b915e01c1fb880d48514bd1fefe3a5d4872eae28
-dist/2024-06-11/rust-std-beta-arm-unknown-linux-musleabi.tar.gz=bc151debda651b76573e77c489c3b9c2be4af0f632e0061e067889f21ab254fb
-dist/2024-06-11/rust-std-beta-arm-unknown-linux-musleabi.tar.xz=f2f9225460e2e7fa7d28cee2dfdab483698c6f51b0eeafe49e2d8e44381a727c
-dist/2024-06-11/rust-std-beta-arm-unknown-linux-gnueabihf.tar.gz=5418a327d270c603ddc903ae6061fcb6bc9bca14593f13fe10ab3fe0f4a656ca
-dist/2024-06-11/rust-std-beta-arm-unknown-linux-gnueabihf.tar.xz=423e7f6fd6555c6d850e7317a8677d4778bc1270d3cfefc05614ef1acc61fd96
-dist/2024-06-11/rust-std-beta-thumbv8m.base-none-eabi.tar.gz=d30d36a72c1e874a7f9df7f805f5cea3617f912b5ad5e7163616b07022e0f7ae
-dist/2024-06-11/rust-std-beta-thumbv8m.base-none-eabi.tar.xz=4afd0b4ab3787dcbb2b2f686d56844c6aa3af69fbd72d04bd57901fdd58b6333
-dist/2024-06-11/rust-std-beta-loongarch64-unknown-linux-gnu.tar.gz=0a9b8bd1d39d346a20803ede808815dbf0cd55d9167561c8aabe7db3300a3dda
-dist/2024-06-11/rust-std-beta-loongarch64-unknown-linux-gnu.tar.xz=e36372611dd3cdabd1f32fb942c79bd31b5fc13946448cbf9a178ad5005dc7b5
-dist/2024-06-11/rust-std-beta-armv7-unknown-linux-musleabi.tar.gz=2fe6221704614b167d837f52cfd439d9586e27ae82a34577659f86382c3192fe
-dist/2024-06-11/rust-std-beta-armv7-unknown-linux-musleabi.tar.xz=55ffdc97b8b6d309b1aa8443b49a5fd6133f5d7653069eb7f32625c1c0bf86ea
-dist/2024-06-11/rust-std-beta-arm-unknown-linux-gnueabi.tar.gz=87386371b64d4d922dc2fd01a0db28191748002b74a59437ddbab572b0d6fce5
-dist/2024-06-11/rust-std-beta-arm-unknown-linux-gnueabi.tar.xz=6c1f9a6683a9d3ad8203b9d08ed829e4990675cb07fdc2214fc1f7970dee7e60
-dist/2024-06-11/rust-std-beta-nvptx64-nvidia-cuda.tar.gz=525a64f28aa0d757e82558737db3150ff90ecb885c3da8e0215370e47fb2ff23
-dist/2024-06-11/rust-std-beta-nvptx64-nvidia-cuda.tar.xz=af49d1730949036a48c05a147a3c67885326df5bea314fef2828e04433f33ef0
-dist/2024-06-11/rust-std-beta-armebv7r-none-eabi.tar.gz=eba00bc621ee0235444698e5bc67780bc93765e70bed11634a8555d8d645635b
-dist/2024-06-11/rust-std-beta-armebv7r-none-eabi.tar.xz=236fe5262d76fd8ab7c12ab6c231608c7e704e5fc0d95210b47e0c86201d8a8d
-dist/2024-06-11/rust-std-beta-aarch64-pc-windows-msvc.tar.gz=ac98cc34543e6faa0429cb9756d1b0d30dc13d8d8a44380b5feecc0e7d083e40
-dist/2024-06-11/rust-std-beta-aarch64-pc-windows-msvc.tar.xz=ed8fffbe7899a7c35e5985adae1b35b7eabd076970a8eac280e834b7877f272c
-dist/2024-06-11/rust-std-beta-x86_64-linux-android.tar.gz=fa53ef5ea66f93f9fa46ac84d3cf6a16743b46a941910b092c9c71208a15defd
-dist/2024-06-11/rust-std-beta-x86_64-linux-android.tar.xz=66b394876549c4faaf872d4103ee49ef59cfba5c78777c01ad1df00dc6babd14
-dist/2024-06-11/rust-std-beta-sparcv9-sun-solaris.tar.gz=63794d1cc16a541cc07b56870d86db2212c2c8e3f06e11fd9bdca90fd93aa56f
-dist/2024-06-11/rust-std-beta-sparcv9-sun-solaris.tar.xz=4d419a3c4402c303b9437c7564e2bea79575623eaa0b300c2fe688d9d8f9db95
-dist/2024-06-11/rust-std-beta-aarch64-linux-android.tar.gz=b82186abf1bb250753a2640def13aa477b606e0601c5c1fdb25af0e37ea638b0
-dist/2024-06-11/rust-std-beta-aarch64-linux-android.tar.xz=57065c7b4f1f5d51d1366164b62b4114ab95f1a68cf551d12db8e9a2dad044dd
-dist/2024-06-11/rust-std-beta-arm-unknown-linux-musleabihf.tar.gz=bef7ed6391f906226a20f8d2d842fbc335891d7fb92f91b1c5873ce778d70675
-dist/2024-06-11/rust-std-beta-arm-unknown-linux-musleabihf.tar.xz=d80843f5f25923605681541b285ebf6868c0368841efacd376aac4dc9f01d0ce
-dist/2024-06-11/rust-std-beta-armv7r-none-eabihf.tar.gz=5b7d75f5f9294327ffb3c441b2e99fbc8402d1dfe0afaa20b2981a987e96801b
-dist/2024-06-11/rust-std-beta-armv7r-none-eabihf.tar.xz=ab56542b3be354d6c4f19fefe90af2daf59507e969a4144b6553a900e37e2a4e
-dist/2024-06-11/rust-std-beta-armv7-unknown-linux-ohos.tar.gz=7365d0ccde4cd000b44992c80cf0e48ead99c2a00e18cde4446d9401792606a3
-dist/2024-06-11/rust-std-beta-armv7-unknown-linux-ohos.tar.xz=69124687ee3ff876f557b7b21c8f78f7015c5f3b6537b65480613469772e00ec
-dist/2024-06-11/rust-std-beta-i686-pc-windows-gnullvm.tar.gz=d1307c1b3fab3dcb6b1e5cfd5c30e1ef1c7b7e1e831ccecb00ce35bc2c1d8b9c
-dist/2024-06-11/rust-std-beta-i686-pc-windows-gnullvm.tar.xz=8685907906feb9e16e34d4ea72e3ad338df9d6407dca6da81739b100926efcd2
-dist/2024-06-11/rust-std-beta-aarch64-unknown-none-softfloat.tar.gz=d8c1c3d800eaedcf23c25f436e30892df1938a618200f0f041fc1921a5b517ac
-dist/2024-06-11/rust-std-beta-aarch64-unknown-none-softfloat.tar.xz=53493d039721d5a2f54eb49ba7e16a205dd846bee559519182ca0af30111d182
-dist/2024-06-11/rust-std-beta-x86_64-unknown-redox.tar.gz=3f9842f81f45cbf35fd923ea69f1c88696070edfec0dcecac286519820741078
-dist/2024-06-11/rust-std-beta-x86_64-unknown-redox.tar.xz=73bc6b9b72bf6a9ba7dabe63b7a7d426eb47716466000d05802ef78ccb9128e4
-dist/2024-06-11/rust-std-beta-i686-unknown-uefi.tar.gz=c9954b477c329c3706891f77e9163d98aeadd96b1aa8a71f1eac20f316a9269f
-dist/2024-06-11/rust-std-beta-i686-unknown-uefi.tar.xz=88876cb6cf03707065fe172540e82faaf5dd55332c939891253476d4da3f8a00
-dist/2024-06-11/rust-std-beta-aarch64-unknown-linux-ohos.tar.gz=e731faa24568e97821c5960229dd9a489ea7ead964a5aa052a6db322bcc55c18
-dist/2024-06-11/rust-std-beta-aarch64-unknown-linux-ohos.tar.xz=47b529a6e19c9d609c41809fd62906c34f23a5c515bf62d91e88a87cf7cc0c85
-dist/2024-06-11/rust-std-beta-loongarch64-unknown-none.tar.gz=c6150b3b7481f2396b305188a16c4ce2206c440e9d7639446c76566d00dc5159
-dist/2024-06-11/rust-std-beta-loongarch64-unknown-none.tar.xz=e641747ef4ae46e4d0a8a3050d00b1b8c21c0f25da53a54de8e540a9953468db
-dist/2024-06-11/rust-std-beta-wasm32-wasip1-threads.tar.gz=37d141ba5beeaefd08834154f66219df734c379c9315c094433aebb75b82bca7
-dist/2024-06-11/rust-std-beta-wasm32-wasip1-threads.tar.xz=2045a0b765de96eb17e18d8028ed2e553cc998fb71a4811e3d848db320f6b9a3
-dist/2024-06-11/rust-std-beta-aarch64-unknown-linux-gnu.tar.gz=82de12e6a2b01c0b98c83b4264a4e00ceefc424f673c97826bb28729c3f31382
-dist/2024-06-11/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz=c97b8a57ed8eefd60bbfe2df54121c548d9e271d9691def843185bac9d82b703
-dist/2024-06-11/rust-std-beta-riscv64gc-unknown-none-elf.tar.gz=6903175fa7cc3fdda5545ce11f4cc504e4183e56c626e25ff2b0d20a4f5190c4
-dist/2024-06-11/rust-std-beta-riscv64gc-unknown-none-elf.tar.xz=df06eee91ba57ff2c0a779da5d746db02f682514b8c03de875f03c96d05188e5
-dist/2024-06-11/rust-std-beta-thumbv7m-none-eabi.tar.gz=d7023edb8c723803e114e5b8ed316a6839e0c37d92cf6a2a09b767ee5ea2b7b9
-dist/2024-06-11/rust-std-beta-thumbv7m-none-eabi.tar.xz=41e19659bc0e0445ebafc49740579f0ac23a9af8e233c529ba2132f3d111faa9
-dist/2024-06-11/rust-std-beta-arm-linux-androideabi.tar.gz=42c0a6bfed8ca53b8833dbee78f2eab92bee061c42a4d629e870c8e655bc3728
-dist/2024-06-11/rust-std-beta-arm-linux-androideabi.tar.xz=5f85c99315a18bfc7fcc3f0caa7218ddc3b6548eb04be0ded835b5c45ec2ae89
-dist/2024-06-11/rust-std-beta-wasm32-wasip1.tar.gz=97abd2b9a68973263da0116eb5a0b9ead2145c1550f3190d02b35606bb9dcf58
-dist/2024-06-11/rust-std-beta-wasm32-wasip1.tar.xz=4ba0ef9b136761e739ab8ef125ffd993ccf71161d69e7640d94de6d5df601dff
-dist/2024-06-11/rust-std-beta-armv5te-unknown-linux-musleabi.tar.gz=886562504ee3e73ceedce6cfcc8d128f22a80f0a33c84b9c29920d7760a8a208
-dist/2024-06-11/rust-std-beta-armv5te-unknown-linux-musleabi.tar.xz=a8f28e60aa1938cdc7b7d46a1fa770d587be9534a291f5367a80a52772a0b458
-dist/2024-06-11/rust-std-beta-x86_64-unknown-none.tar.gz=642e7fbeaa76403ccfaf6c3c1bfaa8b94ded7311abfece44c863df231c282406
-dist/2024-06-11/rust-std-beta-x86_64-unknown-none.tar.xz=b1441ef88a1a97ecb6d7b674b571beeefab9f59fc8799d9e63b8a01078042f15
-dist/2024-06-11/rust-std-beta-i686-unknown-linux-gnu.tar.gz=fba54c97da35d0f11af99dca7cb0f43784da2104c461518149974da1f2248301
-dist/2024-06-11/rust-std-beta-i686-unknown-linux-gnu.tar.xz=e7acfab1f7bb8b2c2a0f7558b813f627a3f6b6dadcd05f62c5895f753c2f3ffa
-dist/2024-06-11/rust-std-beta-riscv32imc-unknown-none-elf.tar.gz=e4d5ec39520d069609f32c4dc7dd4114623bcd112a729529a096c992fc19f61e
-dist/2024-06-11/rust-std-beta-riscv32imc-unknown-none-elf.tar.xz=94d508cc6c86516ae5e3bba9366cb466635a1e3f41fd00ba6b1a44a87175fea5
-dist/2024-06-11/rust-std-beta-armv5te-unknown-linux-gnueabi.tar.gz=76e17967c09311f9e0c684531f21588d5bfbbdd4c707e454068df240fcfa56ab
-dist/2024-06-11/rust-std-beta-armv5te-unknown-linux-gnueabi.tar.xz=e627a81855b3d93497b071138917dcf6382b60793a4a76073769537531d01789
-dist/2024-06-11/rust-std-beta-x86_64-fortanix-unknown-sgx.tar.gz=aa5a1b430e31bd5f912d378eab8447ecd920a5840c03b01799a410d86a7c4850
-dist/2024-06-11/rust-std-beta-x86_64-fortanix-unknown-sgx.tar.xz=20f6fc50caaff58aa2883696c61031e9cec5cc24aea94026cf9b84a7642c4d31
-dist/2024-06-11/rust-std-beta-i686-unknown-linux-musl.tar.gz=62d2daf4c1a0a6b4630559c64bc22ceccd658ea0e9e74ebf58a9b791226964fd
-dist/2024-06-11/rust-std-beta-i686-unknown-linux-musl.tar.xz=34681e4cac9a6e18f1952f51d6192c8b71b970a0edaf0a06766e1a576a7898d9
-dist/2024-06-11/rust-std-beta-armv7-unknown-linux-musleabihf.tar.gz=da45a5c9a7c7c1db32d6664358699ceeb27f59247862190a93ac203e5f49f116
-dist/2024-06-11/rust-std-beta-armv7-unknown-linux-musleabihf.tar.xz=f881c61a8ed04f02576374a82f28505be2ad4b694254503d30c1ab415b6b5a74
-dist/2024-06-11/rust-std-beta-i586-unknown-linux-musl.tar.gz=2056b8d9d54baeab1fcf7dcf65916645f8404413bff60851fd97108b7822a54b
-dist/2024-06-11/rust-std-beta-i586-unknown-linux-musl.tar.xz=d06fd5dcb976c5331185d308e2ac0e53597275a57603aa171a753b3d005f0667
-dist/2024-06-11/rust-std-beta-armv7-linux-androideabi.tar.gz=27fb1ba34b2331810174f88d0e75075d6af26ef3fb7cd3ec820408e819f36cc8
-dist/2024-06-11/rust-std-beta-armv7-linux-androideabi.tar.xz=f44ff932cecc16cb292a6149ac42fb440b5e4a8a6b56f55634d9031002eb56f7
-dist/2024-06-11/rust-std-beta-aarch64-apple-darwin.tar.gz=3ab3178d3c1d4b9908dc2d0b6236c147e8f787f323c0c02fb924e2d692ec839e
-dist/2024-06-11/rust-std-beta-aarch64-apple-darwin.tar.xz=4b67844f0413cd1b0fde9702542eb2ce297020c29531230c37d3e2f65d56b0e3
-dist/2024-06-11/rust-std-beta-aarch64-apple-ios-sim.tar.gz=317035259b48845882a4561bd1c61108331ce68231b3362fa6e9b0a323ea3fc5
-dist/2024-06-11/rust-std-beta-aarch64-apple-ios-sim.tar.xz=04585ea6b3e53cdf62372dc64f00237d26991a2f7ca6ce06f921065957c2ffc8
-dist/2024-06-11/rust-std-beta-x86_64-unknown-freebsd.tar.gz=048684f3b437110dee704d8ef58f166806d69504a0fbf661ad71d19575cc8436
-dist/2024-06-11/rust-std-beta-x86_64-unknown-freebsd.tar.xz=43762fd9d2cf4dda5e8b64dccbabf5637dde37685530eceba060faeba8212b62
-dist/2024-06-11/rust-std-beta-armv7-unknown-linux-gnueabihf.tar.gz=40b3feff4834beb31125cffff479288adb2cc8a2d9b8963943907ba2b5478589
-dist/2024-06-11/rust-std-beta-armv7-unknown-linux-gnueabihf.tar.xz=f088ad7f9697570c251655adbf6921341f74bb8deaa445cdb0d15e5ab556699c
-dist/2024-06-11/rust-std-beta-thumbv6m-none-eabi.tar.gz=94b65456fa327c6d8acd59f1fd004feea8572374e8eadc022338de75c45a6c03
-dist/2024-06-11/rust-std-beta-thumbv6m-none-eabi.tar.xz=9ca368829aaab88a93abb580a0ecc1195ce5fa3877bd556c856ab52af51095ec
-dist/2024-06-11/rust-std-beta-x86_64-unknown-uefi.tar.gz=1a9892b1efce5e6aaa361675e008c623c47056a64deb73246c4211f5194f31a9
-dist/2024-06-11/rust-std-beta-x86_64-unknown-uefi.tar.xz=e9a2df6f754ff4c1ced354250de51939efb1e003843f1d0d8962c2a25e7c0f46
-dist/2024-06-11/cargo-beta-x86_64-unknown-illumos.tar.gz=d6f794f092c47e97e822dd6526ac2622f8a7b3a3cfa8b8462b3378eb16dc4801
-dist/2024-06-11/cargo-beta-x86_64-unknown-illumos.tar.xz=bcf8204f4750c6ea9ff5667ae07de7d06e5b68e78176adb79fc1bc433f7d90c0
-dist/2024-06-11/cargo-beta-x86_64-unknown-linux-gnu.tar.gz=27ba1abe717de9e96b802c8026a17a6b5f5dc728ba4813c705a03d54c234be3f
-dist/2024-06-11/cargo-beta-x86_64-unknown-linux-gnu.tar.xz=55cbb9abf863c05f13049bc59e99ea3e64523f0193ba1dd155b21cb732db50c2
-dist/2024-06-11/cargo-beta-i686-pc-windows-msvc.tar.gz=ceb0b610395fb2519bc6207b7916f402a17fac9685cf8b5c2ee354b350b396ff
-dist/2024-06-11/cargo-beta-i686-pc-windows-msvc.tar.xz=73f1cca9028510331477a0299e214d50a3b9ad02ac035d056acce110f52a1463
-dist/2024-06-11/cargo-beta-s390x-unknown-linux-gnu.tar.gz=eb0dbf227a1ad39436af2334ddb6e90831881c75c24855e9c040bcbb6ce8d876
-dist/2024-06-11/cargo-beta-s390x-unknown-linux-gnu.tar.xz=1b95d58699e8f534b5d93ad02c4281d8e791e8c266f10820de887fe13b1d88c6
-dist/2024-06-11/cargo-beta-armv7-unknown-linux-gnueabihf.tar.gz=b078cbb4e2e18b6da3618a1048b038c52bf37a398618179b1c03f25d5e154ce0
-dist/2024-06-11/cargo-beta-armv7-unknown-linux-gnueabihf.tar.xz=80bd1e79864e21ed914a6a2b8ee5d66867734252002789c6d76c3f7e82133eab
-dist/2024-06-11/cargo-beta-x86_64-unknown-netbsd.tar.gz=e2fb5140e90588e6ab158352e3f198ea71107a1aa01785f692d5ef64925af58d
-dist/2024-06-11/cargo-beta-x86_64-unknown-netbsd.tar.xz=6bf7fc08f593ef8847b3b14a33783fb3c54c542fe61a8a92c0e462a1bbf34b9c
-dist/2024-06-11/cargo-beta-riscv64gc-unknown-linux-gnu.tar.gz=6cc72fe175632e68fefaea683c0569e9fe8f036488154e4f1ccd6a3135479cfa
-dist/2024-06-11/cargo-beta-riscv64gc-unknown-linux-gnu.tar.xz=b27004517d35019ead69bcd1a09c81aa20d2b00b57ad42655f1f434f8d66eed3
-dist/2024-06-11/cargo-beta-x86_64-pc-windows-msvc.tar.gz=e5d5945884554970344d16e90f9eed0dd60f61ed57e48b40fac2ee1d7c035475
-dist/2024-06-11/cargo-beta-x86_64-pc-windows-msvc.tar.xz=421ee0fca436d4d4d3bcd03c242f9312fa620da854b906618a1d8ab27979d609
-dist/2024-06-11/cargo-beta-aarch64-unknown-linux-musl.tar.gz=7406ba1c14e53da0a9ca696dc6c90fb816c072734f569c01f49c6b8f7d542d81
-dist/2024-06-11/cargo-beta-aarch64-unknown-linux-musl.tar.xz=917a2e63fcf03be81375143692306afb54fc2addef9f5508dd58fc1729119752
-dist/2024-06-11/cargo-beta-i686-unknown-linux-gnu.tar.gz=bdbd9c4e2808d9dd0acd219c3ba9972634d73fc4f177468bc196c66be620df65
-dist/2024-06-11/cargo-beta-i686-unknown-linux-gnu.tar.xz=e64d3405f99f8ad74984b81238a088b250be4e079e2c05aa68be1cf84f04154c
-dist/2024-06-11/cargo-beta-powerpc-unknown-linux-gnu.tar.gz=bf7c374c02676f9e5a50f4964e6deb4d3aab19ecd66c4d246de0c9a06ebd23bd
-dist/2024-06-11/cargo-beta-powerpc-unknown-linux-gnu.tar.xz=52e7907ca99467c71429d03012a3f6cdd95711b9cf002d3aa06ba25b3e53d2b1
-dist/2024-06-11/cargo-beta-x86_64-unknown-freebsd.tar.gz=bd9aace135befd19104b193e09bf982c79c8cb9cce301ff709cde2ee2dc82821
-dist/2024-06-11/cargo-beta-x86_64-unknown-freebsd.tar.xz=c0d2c3a2e56a1f43f62fb73e41b07def93baa278172d822a2a33f571d54f0463
-dist/2024-06-11/cargo-beta-x86_64-unknown-linux-musl.tar.gz=61526c6e4f0ce1a57d4831ac67252cf5a6cef3c106c6953b329bc0aa9c685e6c
-dist/2024-06-11/cargo-beta-x86_64-unknown-linux-musl.tar.xz=82bcddea6b3d976e7dee07afe7f805f5a6ff66f0721d281d2c896f352f395c89
-dist/2024-06-11/cargo-beta-aarch64-unknown-linux-gnu.tar.gz=70c5bd18c756123f033a7cec027631f71d7400cb4d0c85d7602a8a6309379070
-dist/2024-06-11/cargo-beta-aarch64-unknown-linux-gnu.tar.xz=f8a6c7dd8ba408a5fe623a0ca1d2f8bfe287b13bc09b1d8ea636ebbdec06c557
-dist/2024-06-11/cargo-beta-x86_64-pc-windows-gnu.tar.gz=fe26e842e6e4186437ea679cc75cd37d70a98b1ed0f17ed9ac876aa0501ebd5d
-dist/2024-06-11/cargo-beta-x86_64-pc-windows-gnu.tar.xz=f3fcb2b698736b3df87c06ba829a1f09c218e37b51ff1c59f165aaf8078c619f
-dist/2024-06-11/cargo-beta-i686-pc-windows-gnu.tar.gz=607f623f30e25541d9e6c8412bffcb9c16f7180250a244dfe1e2606edd45db42
-dist/2024-06-11/cargo-beta-i686-pc-windows-gnu.tar.xz=604369c997e05719d0fae92f7904e6b66f662bb75add1d836cb100e0032526a3
-dist/2024-06-11/cargo-beta-aarch64-pc-windows-msvc.tar.gz=de283125b79d17f4cf24bb608819177ac1637525b8c7e67a66e798f0c0b1024a
-dist/2024-06-11/cargo-beta-aarch64-pc-windows-msvc.tar.xz=8228a47ce003faf1edb4a10cf800d3316ba421a97176c97f6952743f7eddf734
-dist/2024-06-11/cargo-beta-aarch64-apple-darwin.tar.gz=8525a4015fa8078921f8bc5f67012c0d5747b7e7111079bffce79f2b696fbd4a
-dist/2024-06-11/cargo-beta-aarch64-apple-darwin.tar.xz=038c700f1b0ab543bb765a4b86638fc7eb1e44257a19d5a5457fcff4fc08f280
-dist/2024-06-11/cargo-beta-loongarch64-unknown-linux-gnu.tar.gz=16c75d17531e10f1bb9e95c79d8c3aa05549db3029663c69d2f56b2d2f3214d8
-dist/2024-06-11/cargo-beta-loongarch64-unknown-linux-gnu.tar.xz=113d97f781bf8d54f457e07fbe3de1d3a0ce0a1f8054a652083b67b81f4cb642
-dist/2024-06-11/cargo-beta-arm-unknown-linux-gnueabi.tar.gz=7856fc9731c3dd7b360eacf422ce358acb2d33a7fd8b16fa190dc77cd9bdb3de
-dist/2024-06-11/cargo-beta-arm-unknown-linux-gnueabi.tar.xz=85c930785fe9857458c9256c5a2849ae223c5dd162bd20ccc8021b2d2ff0a6ba
-dist/2024-06-11/cargo-beta-x86_64-apple-darwin.tar.gz=aa4aec2cf417a7446c2990d03cfb3dcaab9d99f5ac249cbb955a59a64b5b7b0f
-dist/2024-06-11/cargo-beta-x86_64-apple-darwin.tar.xz=01d4bd8dd8a58f16ee31df775d0d7046ce671dc86f8907514e3713a62aadbb12
-dist/2024-06-11/cargo-beta-arm-unknown-linux-gnueabihf.tar.gz=6e5c68d0665add368a6574528184dc1d182e7d72b8da0827b69eb9f9aecbc4ac
-dist/2024-06-11/cargo-beta-arm-unknown-linux-gnueabihf.tar.xz=180a6148f5c5be222d4e2626eed9cd7de2e0f62d0b456e520d1ab7c4931e1f4e
-dist/2024-06-11/cargo-beta-powerpc64-unknown-linux-gnu.tar.gz=6af892aa858f35708bf9db322abf35967b1e92725e05f6974e1d9ee3cb4c7b84
-dist/2024-06-11/cargo-beta-powerpc64-unknown-linux-gnu.tar.xz=40ffc9713504366978bb6f2eea12741400164318945df22290c7b669d3b77878
-dist/2024-06-11/cargo-beta-powerpc64le-unknown-linux-gnu.tar.gz=9989b0189f7a4c5aa39c39c78be04e7291cc1358ebed597636f404f56980c199
-dist/2024-06-11/cargo-beta-powerpc64le-unknown-linux-gnu.tar.xz=8c7d7dc2530f25cc771c75d454fd11f3e94c7954bb869e43736860be1f253d2b
-dist/2024-06-11/clippy-beta-i686-unknown-linux-gnu.tar.gz=94505902c45770c45a89ea12759bf46cd97efed657b43322d5dd09c13ed26331
-dist/2024-06-11/clippy-beta-i686-unknown-linux-gnu.tar.xz=14830f6fa92b0d814527a9aa5575d0cd529e76dbe2481533b819c735470ad684
-dist/2024-06-11/clippy-beta-x86_64-unknown-netbsd.tar.gz=5cc5f4202003b940a6a62c2384c749b741a9f6d62461ba13a6179464f6c3e6ea
-dist/2024-06-11/clippy-beta-x86_64-unknown-netbsd.tar.xz=01f4f0ef78f17e4991ddf3d974ef7b1dc9d56702ee2d65ede4918e9db99ec222
-dist/2024-06-11/clippy-beta-aarch64-pc-windows-msvc.tar.gz=ee6b64a7a0fc8d8482c38d2a263f9a9ed0b9462e6bd748a72e33c5cd7dac015b
-dist/2024-06-11/clippy-beta-aarch64-pc-windows-msvc.tar.xz=f91457f5dccfc81a601b075da340bf521e3cc17ba05d12f90c31c7f5b215a7bf
-dist/2024-06-11/clippy-beta-aarch64-unknown-linux-gnu.tar.gz=7da546ff13b3e340f2ba22e6995566cb26e487271e3f1b68b3b7dc0bd5122623
-dist/2024-06-11/clippy-beta-aarch64-unknown-linux-gnu.tar.xz=01807b62c65fe33acd05d10191cb16ee1bdeb1bd7b410a9c0cfd8f53006624da
-dist/2024-06-11/clippy-beta-arm-unknown-linux-gnueabihf.tar.gz=64f41430de84569a7b933db7f0c573fecf99f5d0c6900e35598c94a433c0296c
-dist/2024-06-11/clippy-beta-arm-unknown-linux-gnueabihf.tar.xz=b30a73278552ddf511ae82620f14ec7324f281582fa4fa9df3fe984510835aa3
-dist/2024-06-11/clippy-beta-loongarch64-unknown-linux-gnu.tar.gz=e6b0ac4bcec2871d2a50e644733399e684d7fa86798131243c4022cbe2ee5222
-dist/2024-06-11/clippy-beta-loongarch64-unknown-linux-gnu.tar.xz=edc629f04503ce88443ca6cce0b74b5833ce50f428e00a02b544f422577abb1e
-dist/2024-06-11/clippy-beta-s390x-unknown-linux-gnu.tar.gz=ac52f8b4a1b6332aca1ad2363195daf571f7f1870ffa6237441dc7928a408167
-dist/2024-06-11/clippy-beta-s390x-unknown-linux-gnu.tar.xz=96b366fa989d2f739a92ee03bcd141b666b942e0b26922acd620e0fea6d44d8d
-dist/2024-06-11/clippy-beta-aarch64-unknown-linux-musl.tar.gz=8ab584ad05a7836bebb20be8d84b0dd3a29d1823dcee3897abde3a47a10e582b
-dist/2024-06-11/clippy-beta-aarch64-unknown-linux-musl.tar.xz=e7b669a2936a22ed6d2a36b70a6593657488e5ed8d00a911bf33ce51c4c0cc51
-dist/2024-06-11/clippy-beta-x86_64-unknown-illumos.tar.gz=419ef233cfdbe9011d74796e8413a8b6c1f8e6281248969eaf7c9157542c1b70
-dist/2024-06-11/clippy-beta-x86_64-unknown-illumos.tar.xz=673a2f16268fba4d9bf7dca2c0758f3ee60f9754cdcefa36032b8140e6fcddbf
-dist/2024-06-11/clippy-beta-i686-pc-windows-msvc.tar.gz=a3c3bd3b90c951ce404a26a59421f00a03e0dc3351d9dd2876346ff096b7361a
-dist/2024-06-11/clippy-beta-i686-pc-windows-msvc.tar.xz=c3e7c1cc91f48003e1b68fdf753011711ee516bc2ff8c7227d427dd8ee98a72e
-dist/2024-06-11/clippy-beta-aarch64-apple-darwin.tar.gz=ad7b4ac9cfacd860e03f8a41da51b4d279d76b7f3f2f8ac8a048a45f89a7ed04
-dist/2024-06-11/clippy-beta-aarch64-apple-darwin.tar.xz=ca5d2d63b8d7cae00c86383d9075b2292a28d1a85864877a6c8282f5596631f6
-dist/2024-06-11/clippy-beta-powerpc-unknown-linux-gnu.tar.gz=12820c3e8b952dfa931783b550f882dd96c48d3b776fa9cdb29b02d66ad14d96
-dist/2024-06-11/clippy-beta-powerpc-unknown-linux-gnu.tar.xz=394873c6b2499ebc385a11b512c7378b95478a0b6f530c5b313fe86b65a18eaa
-dist/2024-06-11/clippy-beta-powerpc64le-unknown-linux-gnu.tar.gz=8d9353baa4388d02d89b42403e07d6a61f314fc975b8fcd737d8f4edb0ab027e
-dist/2024-06-11/clippy-beta-powerpc64le-unknown-linux-gnu.tar.xz=3cf0511bc5b14619dd6ca1cfeed003effa7fbfecb42fc096a45a211d1ccf419a
-dist/2024-06-11/clippy-beta-x86_64-pc-windows-msvc.tar.gz=cfae39e5d5cbc817aa3ba892822fe2ff122df8a648106aaf0ec18b1ce1a02632
-dist/2024-06-11/clippy-beta-x86_64-pc-windows-msvc.tar.xz=1f1f0596bef154eb3fb4e73993794850f8ad903f4dd0ef9697aa8d5b4d6ec2b7
-dist/2024-06-11/clippy-beta-x86_64-pc-windows-gnu.tar.gz=0909caa93377b2aaf2a05a345e8cfea2c69dc27bd7f7d7a9515576e90cd0aad3
-dist/2024-06-11/clippy-beta-x86_64-pc-windows-gnu.tar.xz=9125bfbaae2103f176b1e1b444fd38c7e74d3414536370037ffc6a85d8567551
-dist/2024-06-11/clippy-beta-arm-unknown-linux-gnueabi.tar.gz=3721470fcc17f8d37c66281bb66c65a66181c80775571520fcc2dfdb583dc640
-dist/2024-06-11/clippy-beta-arm-unknown-linux-gnueabi.tar.xz=79ec48af2925aaad12be405fb72dc9bd9e2ca89fd3a6017111020570ddeb6585
-dist/2024-06-11/clippy-beta-powerpc64-unknown-linux-gnu.tar.gz=d957f503dd4d9d228b6a445eab1183dbc6509a49ccbd475d25143cf1dd28f03d
-dist/2024-06-11/clippy-beta-powerpc64-unknown-linux-gnu.tar.xz=da7ec767b4a85fa327c957888b228671b2311286043165926942504239008d3b
-dist/2024-06-11/clippy-beta-i686-pc-windows-gnu.tar.gz=51ff631084254be43d79d7791000a14ad9f11239e42be73f48383f774109c2cb
-dist/2024-06-11/clippy-beta-i686-pc-windows-gnu.tar.xz=52079acb4f908150d207a838cc7d3c15a725c1d61be35d0d0b2ed85b3386f3fc
-dist/2024-06-11/clippy-beta-x86_64-unknown-linux-musl.tar.gz=99a534de9e5fb552a4e7a10eca2645ad260a723f42e15df3b4e2bacf82e90348
-dist/2024-06-11/clippy-beta-x86_64-unknown-linux-musl.tar.xz=7f9e6da187bb71c384f5040298c43bd303fcbc5e3034dd7fdc7b251c5d7b3a34
-dist/2024-06-11/clippy-beta-riscv64gc-unknown-linux-gnu.tar.gz=acf05b62fc219ddc2fc4e4bca2bc4c2cca24398d6276bd7e7d9f8504627094c4
-dist/2024-06-11/clippy-beta-riscv64gc-unknown-linux-gnu.tar.xz=c737aaf9c4bc3a743752b13159902fc5a8ce746f44221799bbcbcb1f9d04dc4c
-dist/2024-06-11/clippy-beta-x86_64-apple-darwin.tar.gz=422e97d9081e66a46ec3f4c2a7ccbf9b6443c7b343e0a2e90845f233536f545c
-dist/2024-06-11/clippy-beta-x86_64-apple-darwin.tar.xz=c9d02836c9d0e48684f0a343d6935848ec75e1faaf7007a6a3e0718b71e77f7b
-dist/2024-06-11/clippy-beta-x86_64-unknown-freebsd.tar.gz=f207fbfca76eb22f7097eb98ccda1da513fed417371a391e43e8d19fad9b76b4
-dist/2024-06-11/clippy-beta-x86_64-unknown-freebsd.tar.xz=61e39b0aa88a1d8e131a461cb3cebd05154c261058b735f29dc6ed603464b5a1
-dist/2024-06-11/clippy-beta-x86_64-unknown-linux-gnu.tar.gz=c68d27b08f9699c7c2cff9e9bdb7485991d8445074e8b84c2e2222fbff209f83
-dist/2024-06-11/clippy-beta-x86_64-unknown-linux-gnu.tar.xz=d5961f82b9688b9c1ccdcaf578b8325e8ac1e0cc2ffa02131fcc3281cc88dcfd
-dist/2024-06-11/clippy-beta-armv7-unknown-linux-gnueabihf.tar.gz=12ccb5b1d82ad22292b337c49d1c5b0c0d584cfb4e649faf6c53471915df2473
-dist/2024-06-11/clippy-beta-armv7-unknown-linux-gnueabihf.tar.xz=80fa7cb902135006046c10db64d9060103dfb1452e8e0ef256f8344fe0a9c8c5
-dist/2024-06-11/rustfmt-nightly-x86_64-unknown-netbsd.tar.gz=c08499ebec188f67477d0c4eac2e172b59f6d66ad4becb36330b5066af6547d8
-dist/2024-06-11/rustfmt-nightly-x86_64-unknown-netbsd.tar.xz=b3f29c79fc8bd64a2e62101468bbaa28338f444839659d4f99df34ccccad5eee
-dist/2024-06-11/rustfmt-nightly-aarch64-apple-darwin.tar.gz=4866e6d478424fb1c01b2b98678107b9c89e67a2cce3db49833bf34007f868b3
-dist/2024-06-11/rustfmt-nightly-aarch64-apple-darwin.tar.xz=e8e6fd846f70a99e6fad735ce4f4c8bca5f6b5f2d63364c2f8a7df85c13b63f4
-dist/2024-06-11/rustfmt-nightly-powerpc64-unknown-linux-gnu.tar.gz=f14077408a763f0fa6218ed97d7697499c2bded289a5953336c727e2de93bd92
-dist/2024-06-11/rustfmt-nightly-powerpc64-unknown-linux-gnu.tar.xz=27324f62ecfdeeb4a66ce3c62219c491f04ac3822305ea771df0381a5f4e5418
-dist/2024-06-11/rustfmt-nightly-i686-pc-windows-msvc.tar.gz=1147008dfa30891e264bf5f469c9528fe47bdfc729a12215e5a985179513cc66
-dist/2024-06-11/rustfmt-nightly-i686-pc-windows-msvc.tar.xz=95fd945a6c9bcbc9549913906a8f2de20adf54b84b82fe8d981dbb5b767f0cfe
-dist/2024-06-11/rustfmt-nightly-s390x-unknown-linux-gnu.tar.gz=4f423c5ce278204dce918ece2af84bdb55429b7a11f630de95a1516e7b113f53
-dist/2024-06-11/rustfmt-nightly-s390x-unknown-linux-gnu.tar.xz=c86fe94c9b6cbc56285478ffa715877d234af19f1b58b3fd4b2af23a0267b657
-dist/2024-06-11/rustfmt-nightly-i686-unknown-linux-gnu.tar.gz=f1200f077402474049f6b817688435db0ebef7fb52ef645d5b5d2f7ceea52a08
-dist/2024-06-11/rustfmt-nightly-i686-unknown-linux-gnu.tar.xz=a0d801ec3aa93389d5c6ae2a95be25ba3a50f53182c0a84a00c38a2f708447e4
-dist/2024-06-11/rustfmt-nightly-x86_64-unknown-illumos.tar.gz=d4e28ad9b054cdd19fce6bbc37dc86210b0536aee5c23bca53a6bf1340fdb5bf
-dist/2024-06-11/rustfmt-nightly-x86_64-unknown-illumos.tar.xz=b0958ab975026e09ba921234353f5a81b3227d23c10ded4be4fe37831e6abd12
-dist/2024-06-11/rustfmt-nightly-loongarch64-unknown-linux-gnu.tar.gz=f1caa15f16aa1c93ee783bf273d0ae6a7abd0b38c93c717f2d49af5444cd4e09
-dist/2024-06-11/rustfmt-nightly-loongarch64-unknown-linux-gnu.tar.xz=130687b9de22fb1d0c4c845cff5475e5959278718e3b6a1af7f1b9e8869b527f
-dist/2024-06-11/rustfmt-nightly-x86_64-unknown-linux-gnu.tar.gz=32e3881c61abfff7f9c006083045ffa5765c0b3a5a6ec46607e5428423ab76da
-dist/2024-06-11/rustfmt-nightly-x86_64-unknown-linux-gnu.tar.xz=c1859b8a44306b5b3ca27b9226bbf351cd3ff3cacb4faf61200d7baa76009367
-dist/2024-06-11/rustfmt-nightly-armv7-unknown-linux-gnueabihf.tar.gz=4f5c23ba3426719c39a7c767be8db83382c84ff7798c5194aefbeda821462269
-dist/2024-06-11/rustfmt-nightly-armv7-unknown-linux-gnueabihf.tar.xz=18d9a2084cd5e55792f3841fc7d6602bd4a973726662b516289385b7908ffa4c
-dist/2024-06-11/rustfmt-nightly-powerpc-unknown-linux-gnu.tar.gz=df5478f63a49c55ffe9cf62a1882feeca019290c0cc9a9ed5a4122b8aa1325cd
-dist/2024-06-11/rustfmt-nightly-powerpc-unknown-linux-gnu.tar.xz=f54c3b8febfa4023a0334dfeee59d75a44f5c1d3a02d2d57959473d6ad51205a
-dist/2024-06-11/rustfmt-nightly-aarch64-pc-windows-msvc.tar.gz=dd2d83a7bcd45a0d5de312a2a4a28b2471a9597d318135214b45a69e1e449f91
-dist/2024-06-11/rustfmt-nightly-aarch64-pc-windows-msvc.tar.xz=02a8ada9d737e115033d26b0691f2ef22428ba2f67b7fbab7c4205df8162a96b
-dist/2024-06-11/rustfmt-nightly-arm-unknown-linux-gnueabi.tar.gz=20bde0cb3ddca790c0d126d5d590b9a35a1c8631b42fbc2d4e85cfe5aa880d04
-dist/2024-06-11/rustfmt-nightly-arm-unknown-linux-gnueabi.tar.xz=dd29e278f79ce1be14ad44d61039e5a6a63e0e597c4736ab153beb758ad37fb9
-dist/2024-06-11/rustfmt-nightly-i686-pc-windows-gnu.tar.gz=09d98f5c61def16b62b980a6cef3b1b3704cde5c0ad2fdd7d23521db410b6b8d
-dist/2024-06-11/rustfmt-nightly-i686-pc-windows-gnu.tar.xz=ef43e61c2d3d90b09494a8dcbb5d2375223fcba6078f2bfb02ea43750b1a76a3
-dist/2024-06-11/rustfmt-nightly-powerpc64le-unknown-linux-gnu.tar.gz=80318fdf7d55c71beb8ff1434b79776c59008f5d62c63530da9f19a67cc18484
-dist/2024-06-11/rustfmt-nightly-powerpc64le-unknown-linux-gnu.tar.xz=05ae6d4f8ed07cc75b333e606af14f239978abe197b70409a5f2aadc7de43a4d
-dist/2024-06-11/rustfmt-nightly-aarch64-unknown-linux-musl.tar.gz=a079a478e9a89c3a24864b44670bdffcebc139bbec9c54e7aab6394c08bcaab4
-dist/2024-06-11/rustfmt-nightly-aarch64-unknown-linux-musl.tar.xz=243c2d7c23e8aeddf9729e1f7f9add6f88f50d012efa02644030110cba111713
-dist/2024-06-11/rustfmt-nightly-riscv64gc-unknown-linux-gnu.tar.gz=76b69b4b25e8c0d47b80491bcbb724a25c02d95e7f9cfe7a9c3c3570c24363c1
-dist/2024-06-11/rustfmt-nightly-riscv64gc-unknown-linux-gnu.tar.xz=027e075c94f53403f03a4fb29d4575928e1cba141fc0713c93edaa4ea5917e42
-dist/2024-06-11/rustfmt-nightly-x86_64-apple-darwin.tar.gz=b34d3f33e7ae81a5a95927997658d738a3d39db01408dad2d9fa72efb539c73f
-dist/2024-06-11/rustfmt-nightly-x86_64-apple-darwin.tar.xz=7efe129502b732219d1d24d59584b5ad002e7dc5288e047b06bbc81fab36e054
-dist/2024-06-11/rustfmt-nightly-x86_64-pc-windows-gnu.tar.gz=231f11ec1c6e4f57556aa32226d22328656d2ceab075cff67c8ab0a1ec32a823
-dist/2024-06-11/rustfmt-nightly-x86_64-pc-windows-gnu.tar.xz=b1cd7aa45a516df3a68814ce52753eeead4134943d610449456a30c682079ad0
-dist/2024-06-11/rustfmt-nightly-x86_64-pc-windows-msvc.tar.gz=3fb86c9281ae8203e1119bc00e8001afe7e894360adc791a9a0ca1d50e6a9032
-dist/2024-06-11/rustfmt-nightly-x86_64-pc-windows-msvc.tar.xz=6380fcfb015a40c4605ff18f8ba54c3be9a8e6a0115ede378565d9cc9943c627
-dist/2024-06-11/rustfmt-nightly-aarch64-unknown-linux-gnu.tar.gz=f3ff749dedcfb259a4b2d66ae30245caeb79fdec3b41a3bb4f65d50b1cf18120
-dist/2024-06-11/rustfmt-nightly-aarch64-unknown-linux-gnu.tar.xz=1ca50ca8ff36df7433a4ab4c8a63c3c91e214f6c7889843edfb9120c1f4f68d4
-dist/2024-06-11/rustfmt-nightly-arm-unknown-linux-gnueabihf.tar.gz=a7f5f171dfef5b67498c93354d9dc5a7443d69f3f9bc0bc56b660d1450e9b7a5
-dist/2024-06-11/rustfmt-nightly-arm-unknown-linux-gnueabihf.tar.xz=dff02f7a7e9ae58c41faf4c5731862d11fee06d17099c1ed18863219a4a82815
-dist/2024-06-11/rustfmt-nightly-x86_64-unknown-freebsd.tar.gz=71dc189c1d29d3fec849b47f64deb831569515e56821511b1221983eb9ed99a9
-dist/2024-06-11/rustfmt-nightly-x86_64-unknown-freebsd.tar.xz=17736f80644c8cdf8239940812962e6f55c1924896f79bd2581d20582a9c752a
-dist/2024-06-11/rustfmt-nightly-x86_64-unknown-linux-musl.tar.gz=b77e4a1e42c7169d91e268972a9195f7c8494e5cffa5fc71720df799a4eaf74a
-dist/2024-06-11/rustfmt-nightly-x86_64-unknown-linux-musl.tar.xz=8cf89f982aaa5559f2cd1721edfdc25f5e99518c418e1a6818c566d668c8f842
-dist/2024-06-11/rustc-nightly-loongarch64-unknown-linux-gnu.tar.gz=7703c27800aa2d871624563380596a18deb90081e38cdf6c05cab8e794e5805c
-dist/2024-06-11/rustc-nightly-loongarch64-unknown-linux-gnu.tar.xz=ca9dcda51c8945db32e004424eaf26d4f541a51a78be87be0063e5a0b06fdd4f
-dist/2024-06-11/rustc-nightly-powerpc64-unknown-linux-gnu.tar.gz=59a2173462baaea0cef3e0f088b4e6ef64e2fe469d1833798d92e844f0126902
-dist/2024-06-11/rustc-nightly-powerpc64-unknown-linux-gnu.tar.xz=0cab2fde15bbfab741eead0b084886f8b640aeb181251368464bd833fd08df73
-dist/2024-06-11/rustc-nightly-arm-unknown-linux-gnueabi.tar.gz=8473ef60ff1d5c7aee90b8e0a984c9be7e095446d87e0f13ebcf10f245c0ef0f
-dist/2024-06-11/rustc-nightly-arm-unknown-linux-gnueabi.tar.xz=657a55f27794460bad174c4f9412e771c679c6b608cc3dbe32903efb075418da
-dist/2024-06-11/rustc-nightly-s390x-unknown-linux-gnu.tar.gz=bea7aff88f7d7622a23e91c437d9616a9f1adfbd56ddcb42ee33589d064d5161
-dist/2024-06-11/rustc-nightly-s390x-unknown-linux-gnu.tar.xz=a5ab0850c71e322b1042815c443c79505f1daab2b4a69f8cce05e3761a24f10c
-dist/2024-06-11/rustc-nightly-aarch64-unknown-linux-musl.tar.gz=8c00db9c85fa8053f78285c8a546afb32d6b864795388f1ee7a6a49d12643625
-dist/2024-06-11/rustc-nightly-aarch64-unknown-linux-musl.tar.xz=c137f5f943d1c3f14a4a8b5eca2b541c43c82738452646df524e57a6ef0cbd3c
-dist/2024-06-11/rustc-nightly-arm-unknown-linux-gnueabihf.tar.gz=a4087ded3076e4d487efcd4a957554255ea1fad5052a01529ea1847559f7b40f
-dist/2024-06-11/rustc-nightly-arm-unknown-linux-gnueabihf.tar.xz=ed2b01ad985668564ba2c3f87dcac4f5c4bcf7ea0b5ecca6a30c1f1c4b63a4ef
-dist/2024-06-11/rustc-nightly-i686-pc-windows-msvc.tar.gz=41db0331bc8f9d164d4198c93234dae41c1b9d2f53d466ee8cdfba4f9704c45b
-dist/2024-06-11/rustc-nightly-i686-pc-windows-msvc.tar.xz=49766cd2ad581f253f3fc0ba4f755a4aeaae954c75d41fa29a9302568e78aa75
-dist/2024-06-11/rustc-nightly-powerpc-unknown-linux-gnu.tar.gz=b57be1a1dc9e70c47564253877bc0cbbdde8a8064a6a4bcf68f8adc6b4c5d4df
-dist/2024-06-11/rustc-nightly-powerpc-unknown-linux-gnu.tar.xz=cf2c4651297993671f033eb9bb9877b157638bc41cb40ccac3294c3fd13786ef
-dist/2024-06-11/rustc-nightly-armv7-unknown-linux-gnueabihf.tar.gz=619c2eb3ed3f153d2c0ba6cbeb7f0e72c67fbb1e40c025752f94b46c9b740426
-dist/2024-06-11/rustc-nightly-armv7-unknown-linux-gnueabihf.tar.xz=105560769c3672133ecb063ac0a8ef541229490401470180af75151403287d3a
-dist/2024-06-11/rustc-nightly-i686-unknown-linux-gnu.tar.gz=211498f7eb884908c8110ce922183bbd6cc05d96d9c8b5c9068dcfc4d29010cd
-dist/2024-06-11/rustc-nightly-i686-unknown-linux-gnu.tar.xz=61beb47b917ce644defed991afa6d82028cb8f1e6a191cf5c84e8be883ad3870
-dist/2024-06-11/rustc-nightly-x86_64-pc-windows-msvc.tar.gz=06036f5bfc00950e03a66e8dcab0eb7420fd055aadb85bd42e11845eef122122
-dist/2024-06-11/rustc-nightly-x86_64-pc-windows-msvc.tar.xz=39d3dc95b1e0cfcc381d27540d100b8325728ef9a6a8b72a0e4ad85e2e957a63
-dist/2024-06-11/rustc-nightly-x86_64-unknown-freebsd.tar.gz=9b7badc1c8443571aec7b403e890d14846c3972b02159c8aacf3157ede69af9a
-dist/2024-06-11/rustc-nightly-x86_64-unknown-freebsd.tar.xz=a1fdcbe1ca277b22c2dc8aced8ac0f34f841e7a7512fe421c2b045608c4ce07d
-dist/2024-06-11/rustc-nightly-powerpc64le-unknown-linux-gnu.tar.gz=5e6105bc6304ea630a8170c785df11cd435521a2ac90348284898c4aab6ed5f2
-dist/2024-06-11/rustc-nightly-powerpc64le-unknown-linux-gnu.tar.xz=97dc7091b1ffa6a23a4b609a680c1f2f63debab80b5c01bc90fe271d6599bf89
-dist/2024-06-11/rustc-nightly-x86_64-apple-darwin.tar.gz=64769377c3714749acf6404d75f46b00ede0107840e736432d759dbfff15b6f9
-dist/2024-06-11/rustc-nightly-x86_64-apple-darwin.tar.xz=8ce829c39fdf21467307ee540c6b06b510d45c76c395947afdc2e5592d775977
-dist/2024-06-11/rustc-nightly-i686-pc-windows-gnu.tar.gz=4c9425ef2d5fdf9badec75783fe61ce0a251fde672c993c5b0069182449e2d7c
-dist/2024-06-11/rustc-nightly-i686-pc-windows-gnu.tar.xz=442467ab4199e2fb62c69a96cc1c9f03478a415877996f0fef20c54760b2e8b9
-dist/2024-06-11/rustc-nightly-x86_64-unknown-illumos.tar.gz=0b4c3520ff6e5b053a6b37f7d3708fb115fbb99981f337a1786d675e70034acc
-dist/2024-06-11/rustc-nightly-x86_64-unknown-illumos.tar.xz=d192e69dd328e6f930ad5b578065ebab12913762845f68ee55b43ddc9ba074a1
-dist/2024-06-11/rustc-nightly-x86_64-unknown-netbsd.tar.gz=0828f2d9395cdac8e9db6ad5c6b3cab3587fc82bccdec9962cd096e43e4f7793
-dist/2024-06-11/rustc-nightly-x86_64-unknown-netbsd.tar.xz=542f61a4c5a719f2583b0ba820207dc9d09cb9a2bb802da7cfbee5273bbfddfc
-dist/2024-06-11/rustc-nightly-x86_64-pc-windows-gnu.tar.gz=289b1bee22b8d9d84e92461694c6558476f944ac07caf2d22f0c4ccf3d29dbcf
-dist/2024-06-11/rustc-nightly-x86_64-pc-windows-gnu.tar.xz=23c86fc06ed9e7bcf8da72085ff88ec224ccddeca78ddc31032b314cb254ad64
-dist/2024-06-11/rustc-nightly-aarch64-apple-darwin.tar.gz=cf045620e63a5e623047490af956e0daf0bb321ed6a215ae355b8829c047e58e
-dist/2024-06-11/rustc-nightly-aarch64-apple-darwin.tar.xz=0abec976185b9573dbc91868ab4fb84ba2837d25f3fa1d74b3a193609387f3fa
-dist/2024-06-11/rustc-nightly-riscv64gc-unknown-linux-gnu.tar.gz=0b1146e24e4e59e4577b1e40d3ca45096864e87bcf9f258a34b9d9cf5abc3eef
-dist/2024-06-11/rustc-nightly-riscv64gc-unknown-linux-gnu.tar.xz=289e97314fd22da08c8943d1240fa94b1cfd2cdf061dea15bfb582a9d482d6a6
-dist/2024-06-11/rustc-nightly-x86_64-unknown-linux-musl.tar.gz=8957493cf92d57381b35d6ce5bbdb408a05c2a6becc8e2cd37b0502e3ef35ffb
-dist/2024-06-11/rustc-nightly-x86_64-unknown-linux-musl.tar.xz=9015e492f773b91054c53aca92ac704336504959779e4b916d42fc966e6058ea
-dist/2024-06-11/rustc-nightly-aarch64-unknown-linux-gnu.tar.gz=aea2dc3831864dc5ea2c389c8208fc82baf1566f4e5688511495db25525e6020
-dist/2024-06-11/rustc-nightly-aarch64-unknown-linux-gnu.tar.xz=9b6f1c3b1656ee2037afe170d6909aa037d484897a83679e2115392a35559062
-dist/2024-06-11/rustc-nightly-x86_64-unknown-linux-gnu.tar.gz=3a962a42e427675df5d8fbc4e638949ec0669a95ecabcdddf5103a9c19f291ac
-dist/2024-06-11/rustc-nightly-x86_64-unknown-linux-gnu.tar.xz=6fe48c92425b41ad7c3e812abe2e5decb117be178a16f6910bd60000fe8f355b
-dist/2024-06-11/rustc-nightly-aarch64-pc-windows-msvc.tar.gz=0a3147dd45cbf54e66b92baec479a5550c63327185baef3df9638c5a740e0921
-dist/2024-06-11/rustc-nightly-aarch64-pc-windows-msvc.tar.xz=d35948d49fa1e526434ca89c2f7542fcfeb86b4ec35bb92f87f387ec37f4ccda
\ No newline at end of file
+dist/2024-08-08/rustc-1.80.1-s390x-unknown-linux-gnu.tar.gz=ed484ba4b98384c621f623ee8514a95d91a526b16ae871a72305cfd3a657031e
+dist/2024-08-08/rustc-1.80.1-s390x-unknown-linux-gnu.tar.xz=0c06439db686645be36390969b503996608f25954eab2b7fd9a2915da6c0bd7b
+dist/2024-08-08/rustc-1.80.1-x86_64-apple-darwin.tar.gz=776599e893224237a780990d7a3ff63b54563439280534b279fc47287d4c1d13
+dist/2024-08-08/rustc-1.80.1-x86_64-apple-darwin.tar.xz=72f7a04d1d283a24d76f1fe2317f7ec97daaeeb4010907ca5e7ef83790d94469
+dist/2024-08-08/rustc-1.80.1-x86_64-unknown-freebsd.tar.gz=c959fb854bdc859572b143127a99a3eed4733bd1733b7c6c99a951bc7d3617e8
+dist/2024-08-08/rustc-1.80.1-x86_64-unknown-freebsd.tar.xz=b9d024008533334359d53d070f3c3ed50f21c9add87814aa4d7363fa79a06a75
+dist/2024-08-08/rustc-1.80.1-loongarch64-unknown-linux-gnu.tar.gz=0c5c5406d7ba67134be531b9853799cc3bd8a977c3890c87cdf0489dc1c9ab7e
+dist/2024-08-08/rustc-1.80.1-loongarch64-unknown-linux-gnu.tar.xz=5ae96e69573690aa48ffb9fecc62826ffb5d2fc280d19d1e54ab36ff48e28b68
+dist/2024-08-08/rustc-1.80.1-x86_64-unknown-linux-gnu.tar.gz=c0eb2bd3f16ef51b2efe8d4f1febd93ad723cd694f16e0827b732b3a3b4b8dd9
+dist/2024-08-08/rustc-1.80.1-x86_64-unknown-linux-gnu.tar.xz=0367f069b49560af5c61810530d4721ad13eecfcb48952e67a2c32be903d5043
+dist/2024-08-08/rustc-1.80.1-aarch64-apple-darwin.tar.gz=dc1fa2b91b259e86d68838028099969939f7074fd554c35acf87889faf29748f
+dist/2024-08-08/rustc-1.80.1-aarch64-apple-darwin.tar.xz=b22ac69b19de26fed67634379ae72cbc8fcc2ad1b1d97c4fbcb747264e69f13c
+dist/2024-08-08/rustc-1.80.1-arm-unknown-linux-gnueabi.tar.gz=cdec7676ec46c5d4573d23d461d95dc51aac848a9b1520893f67e308a1723638
+dist/2024-08-08/rustc-1.80.1-arm-unknown-linux-gnueabi.tar.xz=c9db7f29deea1ec6c56f6fbebf503902abf13688c47bae2b64a750cbefcf92bb
+dist/2024-08-08/rustc-1.80.1-powerpc64-unknown-linux-gnu.tar.gz=04f360e2e79c58427dc903326b3551140829530ae2ddc4f6d38124f6408a290e
+dist/2024-08-08/rustc-1.80.1-powerpc64-unknown-linux-gnu.tar.xz=e3257dc0790728498cf2773c3ca66d728381cc6d1f403969bd282223bd97aa3d
+dist/2024-08-08/rustc-1.80.1-x86_64-pc-windows-msvc.tar.gz=ef611257bb224cf80d24fc5b9d1587cde9e1292dc1aef4dfeeccfbdd30275620
+dist/2024-08-08/rustc-1.80.1-x86_64-pc-windows-msvc.tar.xz=9a7aab691649f4e4da9dd14e37d53e7997c9e1b8ac0a5453cd8167d26f87a56c
+dist/2024-08-08/rustc-1.80.1-i686-pc-windows-msvc.tar.gz=b847b64f0177d16b42dc49a86766c3f156f5661c64d8b354c1cd972d60b276ff
+dist/2024-08-08/rustc-1.80.1-i686-pc-windows-msvc.tar.xz=a06fdb37862b2864bee81d9b23758e1d927f8e953e0097a6c3e1f192c3af3928
+dist/2024-08-08/rustc-1.80.1-powerpc64le-unknown-linux-gnu.tar.gz=bc4fe9abc277392eece7d59203e4bdd0c6d6217d013f7c353f5c236e3bd62b18
+dist/2024-08-08/rustc-1.80.1-powerpc64le-unknown-linux-gnu.tar.xz=5f72f8723a2023b0bbd64cfc3d10959c4210b68579ad8e174809d17e1e2ead36
+dist/2024-08-08/rustc-1.80.1-x86_64-pc-windows-gnu.tar.gz=d20f98a9ba75aedcded483eba9619af6bffd37bdaf10a265686b66598cafa264
+dist/2024-08-08/rustc-1.80.1-x86_64-pc-windows-gnu.tar.xz=83ed814bb9f5ff14ee486572587ee631218099cc77d2eaefe42f7275bbfa4659
+dist/2024-08-08/rustc-1.80.1-aarch64-unknown-linux-musl.tar.gz=d483a430bccdfb52e3cfaa381a842c3d1f7e85fd5b15c82a416dc9568b8916d0
+dist/2024-08-08/rustc-1.80.1-aarch64-unknown-linux-musl.tar.xz=d3a883b8aebda30a5a1f55ca905dd1d7eaf28b1a27791655fcc27ba4b656967d
+dist/2024-08-08/rustc-1.80.1-arm-unknown-linux-gnueabihf.tar.gz=1c46162973ec863a75c739bdaac580215e4558ab1933035a9db6e023638093e6
+dist/2024-08-08/rustc-1.80.1-arm-unknown-linux-gnueabihf.tar.xz=a77a76f0d5c83e48785f5de0266680782ff10af00c5c3f9edbb1656f42ef85ca
+dist/2024-08-08/rustc-1.80.1-x86_64-unknown-linux-musl.tar.gz=6a3a6e9afe24f56d2aa87353f38a9a6690f58e4f1f1da5a1bab9a8bb7d91dee0
+dist/2024-08-08/rustc-1.80.1-x86_64-unknown-linux-musl.tar.xz=254141eed904ff8cf3b23906b11473bd9e779b301cf71318d01ce89e2bcf45e6
+dist/2024-08-08/rustc-1.80.1-powerpc-unknown-linux-gnu.tar.gz=0c8729739ad2592be30b7caa81a51defcae61e279774c6493dffd88e5ac7bfba
+dist/2024-08-08/rustc-1.80.1-powerpc-unknown-linux-gnu.tar.xz=5f435b48316a719c87fb27f49c0b37884cef7dd3ecba76df9db2a4008cc03458
+dist/2024-08-08/rustc-1.80.1-aarch64-pc-windows-msvc.tar.gz=a859ad0f24df92ab33095d19f9a8aced2aa35bd8cb80de5f2fba2ebb5ee85e5d
+dist/2024-08-08/rustc-1.80.1-aarch64-pc-windows-msvc.tar.xz=7d1411d37f26c8168a0f56ae2fa80d7ec83e5f11cd9d3c71cf5538f241c03c5e
+dist/2024-08-08/rustc-1.80.1-i686-unknown-linux-gnu.tar.gz=b7b3258672a3d5fc22e16d8d83135348118d22364566ed12cf81ce7702bc2268
+dist/2024-08-08/rustc-1.80.1-i686-unknown-linux-gnu.tar.xz=b40c1437491d0a24756b6baabb14c2d4d0def199bc652f16e417addb171ac977
+dist/2024-08-08/rustc-1.80.1-x86_64-unknown-illumos.tar.gz=b699df8f37894249d6571d2145eeca9d800d9b5b5f848dcc5d9fe82925325c4d
+dist/2024-08-08/rustc-1.80.1-x86_64-unknown-illumos.tar.xz=9b0b35862a86568210e69c1087027fd8fabb2098926232ad27945018ed8af10a
+dist/2024-08-08/rustc-1.80.1-x86_64-unknown-netbsd.tar.gz=16f592030ec3946f60c9c86aeef972c9be728141ff1c92c34567539a42b75b5b
+dist/2024-08-08/rustc-1.80.1-x86_64-unknown-netbsd.tar.xz=a380c22e2342f2c40924af3f5418ccb31726a84e676a36ebed92c6113e277b44
+dist/2024-08-08/rustc-1.80.1-riscv64gc-unknown-linux-gnu.tar.gz=8e329ae6b822e0caf76423ea384673937007ed2fab2baf73548f85afca0af6ad
+dist/2024-08-08/rustc-1.80.1-riscv64gc-unknown-linux-gnu.tar.xz=838d78ef8b9a11751b1dfb2cf2abfdc845deca8f0002c11930d54577b433cb93
+dist/2024-08-08/rustc-1.80.1-i686-pc-windows-gnu.tar.gz=ca2c0c370c183330b56605971ec25235b55f0a6c45b50a540569119e939eb98e
+dist/2024-08-08/rustc-1.80.1-i686-pc-windows-gnu.tar.xz=72a7b22a96c915f0bb5e28995be2c92e52b8c869bbbfdf43e8a75f60230fd00a
+dist/2024-08-08/rustc-1.80.1-armv7-unknown-linux-gnueabihf.tar.gz=85fe3e5a44b8adcf0241997a45b4baabf875a48c45db67726464baa189a24f84
+dist/2024-08-08/rustc-1.80.1-armv7-unknown-linux-gnueabihf.tar.xz=97a427f4691b0632aa4eb49722baf8f39a94a684388ddfa590a8c42c992b6764
+dist/2024-08-08/rustc-1.80.1-aarch64-unknown-linux-gnu.tar.gz=b49e0806920cdb71f17a3fa3fb0763536a7f36ce87431f2088988c10ce3e3034
+dist/2024-08-08/rustc-1.80.1-aarch64-unknown-linux-gnu.tar.xz=fc21ca734504c3d0ccaf361f05cb491142c365ce8a326f942206b0199c49bbb4
+dist/2024-08-08/rust-std-1.80.1-loongarch64-unknown-none-softfloat.tar.gz=f710d65eb32664182ecde883dbf2279ee71d7a0cde869cebdbb7ae1629bb982a
+dist/2024-08-08/rust-std-1.80.1-loongarch64-unknown-none-softfloat.tar.xz=9b9e82d80a28bd1e49d60a16602f4c50df25f9110f85ac193a7bb34b61e5958a
+dist/2024-08-08/rust-std-1.80.1-aarch64-apple-ios.tar.gz=3d29cb395da2bbed7b8e1b9846360ba03686b26bdbc8bf8c279c093e450f6105
+dist/2024-08-08/rust-std-1.80.1-aarch64-apple-ios.tar.xz=f944deac55bb33f1ac755761397d164bb5cb9ab4ad37fed3c09d10c1ef69e54b
+dist/2024-08-08/rust-std-1.80.1-i686-pc-windows-gnullvm.tar.gz=b8ba838932d315d7d4945bb51c037a5b41a72295d1df51e86422e5ecb2870c14
+dist/2024-08-08/rust-std-1.80.1-i686-pc-windows-gnullvm.tar.xz=2836fbc998fc7fdb775077fb109ee13f9349e8fd1c832db524adb49e2cad7b7f
+dist/2024-08-08/rust-std-1.80.1-riscv64imac-unknown-none-elf.tar.gz=9ba273f2107b2e735d0b216bb11664f779c4824f074370ff63fe9e1fad600366
+dist/2024-08-08/rust-std-1.80.1-riscv64imac-unknown-none-elf.tar.xz=4c875a44a0611154bd5bbcc8f66ef45eeeed9d563736bcc6cf9669a3ae6b2752
+dist/2024-08-08/rust-std-1.80.1-armv7-linux-androideabi.tar.gz=20313b49410695cf65548cb59fe3769d2320cdc704ad49ea75080cd8a5ca3b19
+dist/2024-08-08/rust-std-1.80.1-armv7-linux-androideabi.tar.xz=c5c98bd83e77a0b7df7205935ff6c5eb025aad9bac256e6e2796e6023b062edf
+dist/2024-08-08/rust-std-1.80.1-riscv32i-unknown-none-elf.tar.gz=859e976d8c43bc21fd964f35947ba488cd9a1b6cdd0dd60667306a1003ac52f4
+dist/2024-08-08/rust-std-1.80.1-riscv32i-unknown-none-elf.tar.xz=2a4f58971cad88da6e39881ab7652db44062e03434f365e3638771f454f3a766
+dist/2024-08-08/rust-std-1.80.1-x86_64-apple-darwin.tar.gz=8fe1bd5ac9fb8741d3049b753a6eabec0e88d9c2c0276fdff34f868b35edda41
+dist/2024-08-08/rust-std-1.80.1-x86_64-apple-darwin.tar.xz=1e45aae10e6546e681759b5b8f3f5f0ac703dfb0e609997c9cce7cf09a7961c0
+dist/2024-08-08/rust-std-1.80.1-riscv64gc-unknown-linux-gnu.tar.gz=46bd7f87e9a9a8dd1dfd4ffd85b4741d1ddccd2224cebeeae921fca9a6f6e579
+dist/2024-08-08/rust-std-1.80.1-riscv64gc-unknown-linux-gnu.tar.xz=1fbbe8df7596682466ae2fca534d5f6bae8b3f32577450e2632955268a786a06
+dist/2024-08-08/rust-std-1.80.1-x86_64-unknown-freebsd.tar.gz=b293f4ad4baa7298b2ccff0da3224b1e9bb64e34d5d1158d0a03fea37adb0402
+dist/2024-08-08/rust-std-1.80.1-x86_64-unknown-freebsd.tar.xz=fce7b9bd4b06d797d803755eeb24268dc93d0c993428d4ce63029b2bd28f393c
+dist/2024-08-08/rust-std-1.80.1-x86_64-unknown-linux-gnu.tar.gz=c58f796e884d5e8882e13775d726f514158aa5e26aef6c4f756bdacdbc1512bf
+dist/2024-08-08/rust-std-1.80.1-x86_64-unknown-linux-gnu.tar.xz=b793405538d8b6ec1632779efa8835b07b8987db2008c5c9c809bc4b17dcb121
+dist/2024-08-08/rust-std-1.80.1-thumbv8m.base-none-eabi.tar.gz=2a9b4f99c087b7ce5c0efcbf25cea91a4221413606a4612a8abe84f5db8a6363
+dist/2024-08-08/rust-std-1.80.1-thumbv8m.base-none-eabi.tar.xz=25ad7ede5e4fe383a692f137b9ea7ef48b917036ec5da8cf689a3fc46a59f4fd
+dist/2024-08-08/rust-std-1.80.1-arm-linux-androideabi.tar.gz=561f4f36d7a9e445e3c1ac7fd85e8b06c7abd8aaa47506552f16c308980b4e1d
+dist/2024-08-08/rust-std-1.80.1-arm-linux-androideabi.tar.xz=e3ff7613296316dcc3892ed9a9f3fe9099a1ca0ab7d4356bb520e5021a2b4acf
+dist/2024-08-08/rust-std-1.80.1-armv7r-none-eabihf.tar.gz=53478bfbf2c83811e8b9ed1174ab66833df5cf4201f9fa3bea9d828706ad83a5
+dist/2024-08-08/rust-std-1.80.1-armv7r-none-eabihf.tar.xz=523868c7b28f6bbcbd437e73c98a4b005915c9018b5a469517c682b8627e53b1
+dist/2024-08-08/rust-std-1.80.1-arm-unknown-linux-gnueabi.tar.gz=80c84eaef0e298fde9728bc985aeb0bb67efa9630db506ff56e54c31ea130574
+dist/2024-08-08/rust-std-1.80.1-arm-unknown-linux-gnueabi.tar.xz=106567c06b8b240fe20071f8b0184b404e629c43ee54511b4f81f7fdbb5e7247
+dist/2024-08-08/rust-std-1.80.1-thumbv6m-none-eabi.tar.gz=ef202a3c63b6b79ccbb9fc4b8c8c4f05ca1ff990dbcd2a299296b29f9df17d09
+dist/2024-08-08/rust-std-1.80.1-thumbv6m-none-eabi.tar.xz=f0d28ad87accd746e5d7043ed7fdaeb302b9c3e4af7c7557876b2d202c22488b
+dist/2024-08-08/rust-std-1.80.1-i686-linux-android.tar.gz=c1b909ebe359c84d37326140b1285eca56d1db995db2651993cc7668523ea73c
+dist/2024-08-08/rust-std-1.80.1-i686-linux-android.tar.xz=0c94c5230d601010afc5df6e7d70801557cd3a4bf47c87e8caae48794d049d25
+dist/2024-08-08/rust-std-1.80.1-x86_64-linux-android.tar.gz=3152706fe03c23d781b1ff42ce9f1303245c540173d6bba202427968a4c2fa56
+dist/2024-08-08/rust-std-1.80.1-x86_64-linux-android.tar.xz=722d4ee4d974e99f7549c085e7fdc56c0766261e9cbc1a2d8912fbe76146afea
+dist/2024-08-08/rust-std-1.80.1-thumbv7neon-linux-androideabi.tar.gz=1d7383154f64454550e7de30e4f5eb7b4713a6fd8549183577e3d69d2145a816
+dist/2024-08-08/rust-std-1.80.1-thumbv7neon-linux-androideabi.tar.xz=5a97ee66d3c4ebb0a9d3374b985d6d823e7f8c9ecd3f800831c44b56f87a747c
+dist/2024-08-08/rust-std-1.80.1-x86_64-pc-windows-gnu.tar.gz=4fb82d57b0422ad31894529d3b45f84c41dec92009e643aa66fc4f418178b475
+dist/2024-08-08/rust-std-1.80.1-x86_64-pc-windows-gnu.tar.xz=b1471627b78201013b67df012788fe30faa2ebcd87b74e8598964aa9aec56608
+dist/2024-08-08/rust-std-1.80.1-wasm32-wasi.tar.gz=ee8739609d3c4ede70376ff8110c457dda84d9157dfc96e1e55abf5db8825180
+dist/2024-08-08/rust-std-1.80.1-wasm32-wasi.tar.xz=7a31056846abef8bea24688e6f0d1da3aef326876e607e1a24c0ee1f5b2d8d69
+dist/2024-08-08/rust-std-1.80.1-i686-unknown-freebsd.tar.gz=d53282995c6ed3e396bb70b769ff5f3e12b26642263f1d9fb741a86a086b80f7
+dist/2024-08-08/rust-std-1.80.1-i686-unknown-freebsd.tar.xz=709f8da3613a36c172ad7225c0572058ec7367ac11bec8330df05fc67cca2c66
+dist/2024-08-08/rust-std-1.80.1-x86_64-apple-ios.tar.gz=68c7c2d05b80b47d50c1552c4a8dbbc9323a01b37d025c835d1fb55f4c42c347
+dist/2024-08-08/rust-std-1.80.1-x86_64-apple-ios.tar.xz=ee562dae8f4ce5b0a3fd5681c63da91aa70d668dab8297431558351cf46ca67a
+dist/2024-08-08/rust-std-1.80.1-i586-pc-windows-msvc.tar.gz=071d8cde777a9a8db810a0aa0186960f747fb28c0f70de1a4a6c12d63bf10dea
+dist/2024-08-08/rust-std-1.80.1-i586-pc-windows-msvc.tar.xz=f591d946d7fc3f2a5dcfabb4177fcba9b923ad06be0d08f83892de20e342d49e
+dist/2024-08-08/rust-std-1.80.1-riscv32imafc-unknown-none-elf.tar.gz=db39ee4a75caccbd5eb347131f7709f8aff4e4c6772e832162305612e4450afd
+dist/2024-08-08/rust-std-1.80.1-riscv32imafc-unknown-none-elf.tar.xz=2e297a57cc1969ffb44c5023e2912f5968d70a34ff03d422d5dbddc8ce06907c
+dist/2024-08-08/rust-std-1.80.1-riscv32imc-unknown-none-elf.tar.gz=b18c94c077e6b3c51d727149b435fc42ced557a8e526a7776f06fa373e968fd3
+dist/2024-08-08/rust-std-1.80.1-riscv32imc-unknown-none-elf.tar.xz=2f04bc8d7f2f4b7815eed4279d4d7277eddafb86e68a3789d532cd86f4d90309
+dist/2024-08-08/rust-std-1.80.1-armv7-unknown-linux-gnueabihf.tar.gz=449a79a9603f292bb2f5751d460241b38dca26d0c808a48cd2c0e13368b81e5c
+dist/2024-08-08/rust-std-1.80.1-armv7-unknown-linux-gnueabihf.tar.xz=a69873dedf9e1d156aa105f5f85aa3b47816bd52bf233573d2f04721014eec68
+dist/2024-08-08/rust-std-1.80.1-thumbv7em-none-eabi.tar.gz=d7b360e533aca06cd1483e1be418c43d85c0acaf0410d3c0771599e2f4fae9bd
+dist/2024-08-08/rust-std-1.80.1-thumbv7em-none-eabi.tar.xz=2f24b20bf32c104a743ff56a6eac94f7182cc987eace6da20800cd90c648f657
+dist/2024-08-08/rust-std-1.80.1-nvptx64-nvidia-cuda.tar.gz=42e7389411c51999f52494e8e9d23a037fee0054d0bb71907908577ae1e2aac1
+dist/2024-08-08/rust-std-1.80.1-nvptx64-nvidia-cuda.tar.xz=d69fc312f8b3a60550d3e2e30d1e9dfbdd902c272d68d0fdafc0beb2cecfcd76
+dist/2024-08-08/rust-std-1.80.1-aarch64-unknown-none-softfloat.tar.gz=80bfe327c0a60f8f4b861206a74abb0208ec144b844013b1de391e3242f5835b
+dist/2024-08-08/rust-std-1.80.1-aarch64-unknown-none-softfloat.tar.xz=1bd68b7f0ad8374e99c290efe3b311d1b2498c76939691e6095ac5b31d027c7f
+dist/2024-08-08/rust-std-1.80.1-wasm32-wasip1.tar.gz=fad1be963e308d9eafbb179bf557cf4dc40520f3a8044d5fea539d9f0baaa73d
+dist/2024-08-08/rust-std-1.80.1-wasm32-wasip1.tar.xz=c27ea566a3ddb6e2ee82f386449af7f26c24b585d4abb0cb38252cd79f678b0a
+dist/2024-08-08/rust-std-1.80.1-aarch64-unknown-fuchsia.tar.gz=e5b3b880a6f3c55cc877dbad50185797a8719f395940184858c07f38ef3ad1df
+dist/2024-08-08/rust-std-1.80.1-aarch64-unknown-fuchsia.tar.xz=c85a3994433223841d942a474689dfa3533ff4632d97e9977ba2d14b74aaeed9
+dist/2024-08-08/rust-std-1.80.1-s390x-unknown-linux-gnu.tar.gz=746072ab43d3680b5beebc677befaf9eb59319b695cef9465f1420b799494e59
+dist/2024-08-08/rust-std-1.80.1-s390x-unknown-linux-gnu.tar.xz=e732ce690fd63e3c2576bfe83a556031c4805c17b35b8a1c1a0ddde5cee31d46
+dist/2024-08-08/rust-std-1.80.1-aarch64-unknown-none.tar.gz=a1327adf5aa9a2a65874b6d3bb43e80f4a034265f2fadca6d0b42802eeb99c08
+dist/2024-08-08/rust-std-1.80.1-aarch64-unknown-none.tar.xz=8df54a961dbbd7a6e70ced484a6fe302a19b9a9b20d8f8542773fc6978a041a5
+dist/2024-08-08/rust-std-1.80.1-x86_64-unknown-linux-ohos.tar.gz=67b451108ff4354b37f885c22065531bf1595a4c3cc425612a3db6c162329f07
+dist/2024-08-08/rust-std-1.80.1-x86_64-unknown-linux-ohos.tar.xz=fcd33bb61cd34a12a400b6f5df9f861311ecfeff93a57e6096b9a9eb4ece8334
+dist/2024-08-08/rust-std-1.80.1-armv7-unknown-linux-musleabihf.tar.gz=df308d1c930e77d62d49e7913bdb5ef08535e1350ab48345cb6fa518fb401f26
+dist/2024-08-08/rust-std-1.80.1-armv7-unknown-linux-musleabihf.tar.xz=40aa0b576216284d5f9aa74e45ea99e44ae207e817a76ff4ade8b64b21d391e1
+dist/2024-08-08/rust-std-1.80.1-i686-pc-windows-gnu.tar.gz=2e98257d504b5ff8b2786192cf4f1347a66c9444bf1aecf7624245d779e9b314
+dist/2024-08-08/rust-std-1.80.1-i686-pc-windows-gnu.tar.xz=6644736d421666ab5a84e4d7f816c341114d1e62f42ffe723d2b26c3fc5e2e8e
+dist/2024-08-08/rust-std-1.80.1-armv7-unknown-linux-gnueabi.tar.gz=5b47eca2ec2ac0dddf7fa9a27f71606826513d18b4cbc264f7c1a292d4c99c74
+dist/2024-08-08/rust-std-1.80.1-armv7-unknown-linux-gnueabi.tar.xz=36f5d0e3a3036c48d9199e836ee3ed3161a8127b930cce7ec5e997e219c71f45
+dist/2024-08-08/rust-std-1.80.1-aarch64-unknown-linux-musl.tar.gz=9ff88076cc699c5e5965f7ea99e2eae614a597c9002cdac0e24b4615f0e6b7e9
+dist/2024-08-08/rust-std-1.80.1-aarch64-unknown-linux-musl.tar.xz=1ac3c0ba6d3afec73bfeeac8ed8d812eb3c00c5202f2c24e57951a510d183882
+dist/2024-08-08/rust-std-1.80.1-aarch64-pc-windows-gnullvm.tar.gz=f5519e9a9244012ccfa90ed9aeca1258fe1090e805adf50020043b623d46fed2
+dist/2024-08-08/rust-std-1.80.1-aarch64-pc-windows-gnullvm.tar.xz=2e67e285ec7307bf93f846ef76b7cb383e4aa5814a3e8870d67b7344969dbd04
+dist/2024-08-08/rust-std-1.80.1-aarch64-pc-windows-msvc.tar.gz=64a9d5545a42382dae58c5dcf4142f86526bb720a1453b9c47e3747a1a699d29
+dist/2024-08-08/rust-std-1.80.1-aarch64-pc-windows-msvc.tar.xz=d9cf6041b117c3b81eb312d0487532f472f9c09dfe54dda8e2dff7ef014873ef
+dist/2024-08-08/rust-std-1.80.1-x86_64-unknown-netbsd.tar.gz=9adb01212cc99966bbb2c371df190eca7ac313397225d54d2f48c40605c3e82a
+dist/2024-08-08/rust-std-1.80.1-x86_64-unknown-netbsd.tar.xz=d4ee1bc55477247bf5e1e73a11341aac15853104e5e87642a726012eae8deb8e
+dist/2024-08-08/rust-std-1.80.1-armv5te-unknown-linux-gnueabi.tar.gz=30cd2b265a2e2e1e392146ff2e84771ec2f58243479135507ec4bf24308228d3
+dist/2024-08-08/rust-std-1.80.1-armv5te-unknown-linux-gnueabi.tar.xz=f45cdd02b0f45e7350e5eef929e55393134f11cbba32ab9eff1f3ae0891d7660
+dist/2024-08-08/rust-std-1.80.1-x86_64-unknown-none.tar.gz=d7162fd09f752b3f8095c0f47bc586221ac523d60b34ab43622f34dd1e915723
+dist/2024-08-08/rust-std-1.80.1-x86_64-unknown-none.tar.xz=c9d93b584e4ed5adfaedb585a7e2e2e5256a8c66fa941757acbebe0a950d3e5b
+dist/2024-08-08/rust-std-1.80.1-thumbv7neon-unknown-linux-gnueabihf.tar.gz=0924775e0bfa5c956f7cc2021871ec2e5a8db531941a68a4cc8d9904d842c274
+dist/2024-08-08/rust-std-1.80.1-thumbv7neon-unknown-linux-gnueabihf.tar.xz=ca2975b1d5e6908d7d7c7fae13f26980b1901a28070034a00dbb0d0a981e2277
+dist/2024-08-08/rust-std-1.80.1-thumbv8m.main-none-eabihf.tar.gz=7a6d6a347015afeb7ffc54ea842650731e1efa8ba69e92ca36400683065b9bfb
+dist/2024-08-08/rust-std-1.80.1-thumbv8m.main-none-eabihf.tar.xz=23c13e07d9a408464384ba699f7dcfc59c5b04081f67dbdad2fbd208fc62615b
+dist/2024-08-08/rust-std-1.80.1-wasm32-unknown-unknown.tar.gz=16b1ba53b8e1e6ba10b9e2f41a3f94d8cc790ce6f3e825eccf7fff87fc608aa5
+dist/2024-08-08/rust-std-1.80.1-wasm32-unknown-unknown.tar.xz=951bc38e8f24936c1c8a8aefc0156cdd4fa5e32ac90ab1fa4534fcf0cc3eb817
+dist/2024-08-08/rust-std-1.80.1-x86_64-unknown-fuchsia.tar.gz=6a52e37bcf271b19c2ce56a628c7965aab8df707a535f581e99775e5566b28b8
+dist/2024-08-08/rust-std-1.80.1-x86_64-unknown-fuchsia.tar.xz=d0bb14b249a1baf267f0f209fb4f7d37f9a1f61053ad3855c40fdbb711ccdc59
+dist/2024-08-08/rust-std-1.80.1-thumbv7em-none-eabihf.tar.gz=961ce06d2f1924a8f30804682351c0e03b0f5f5bb606c01486db8b043f621742
+dist/2024-08-08/rust-std-1.80.1-thumbv7em-none-eabihf.tar.xz=6bffb5782b125b937fdbac1e3ff6e6f86756c25b826de44faf2a78c291493e5a
+dist/2024-08-08/rust-std-1.80.1-x86_64-unknown-redox.tar.gz=ec79242a41c998569b84ccb213a187095fdfc3938cd0430ad6529a0b20ff56c9
+dist/2024-08-08/rust-std-1.80.1-x86_64-unknown-redox.tar.xz=4b460f9627a71b690e8f9423341c73856f473ad354456f2c5590dd3be6a4e30a
+dist/2024-08-08/rust-std-1.80.1-riscv64gc-unknown-none-elf.tar.gz=da8c8dd35cdcbb34ec1931a6a3fc74e9d9ce4ed2dc1ad2225300897163b2bcd2
+dist/2024-08-08/rust-std-1.80.1-riscv64gc-unknown-none-elf.tar.xz=b9bed482d7857e9fec3239e279505c547b1fc11d863ab01adfa24c4a1c24f8ce
+dist/2024-08-08/rust-std-1.80.1-x86_64-pc-windows-gnullvm.tar.gz=01a1338f94695e667f5502d0f6cb14f326e3f6a7ad31425e707901e0f162197c
+dist/2024-08-08/rust-std-1.80.1-x86_64-pc-windows-gnullvm.tar.xz=25f0f5aea9d671efb9eed10ce02ae0c956c45e851c0119a7af80cca28a7c4d8e
+dist/2024-08-08/rust-std-1.80.1-aarch64-apple-ios-sim.tar.gz=a9cd1a476f699d2598bef6901521095f4b3ce5fa5226725c6468780d20422288
+dist/2024-08-08/rust-std-1.80.1-aarch64-apple-ios-sim.tar.xz=9989ba403aa2f00f0ff745a2daecb0bb8fc98a09f2cbc01f72d7d7823f2313f8
+dist/2024-08-08/rust-std-1.80.1-arm-unknown-linux-gnueabihf.tar.gz=fce25b4bf41c1a89c165bc38e8f0d17f450f6b16a0b4df64ac027287ae7d19e7
+dist/2024-08-08/rust-std-1.80.1-arm-unknown-linux-gnueabihf.tar.xz=f0dd131f05e0801fcff35a23015fe83027865b936bccd402c8a9164400d27769
+dist/2024-08-08/rust-std-1.80.1-wasm32-unknown-emscripten.tar.gz=6b2ba62ff33e3156f0474ca581cf8da92e32a31c490266523e40546bbfc80910
+dist/2024-08-08/rust-std-1.80.1-wasm32-unknown-emscripten.tar.xz=0a24425dc2631e2309c561966b78ff6930dc60ff7fd355c4826bf899c58f5e72
+dist/2024-08-08/rust-std-1.80.1-powerpc-unknown-linux-gnu.tar.gz=cb2c38a8134e3c8b0e93adbb2165e5d442527f863fdf5224808dc935860807a0
+dist/2024-08-08/rust-std-1.80.1-powerpc-unknown-linux-gnu.tar.xz=88e8144c25ef8347471dd53eea7af62e5b31eadf0788f4a82be7560f5a0be255
+dist/2024-08-08/rust-std-1.80.1-x86_64-pc-solaris.tar.gz=e3dbf17cff2f546bade7d3b982169a35ec11871b3ff905c4caba53248c453e91
+dist/2024-08-08/rust-std-1.80.1-x86_64-pc-solaris.tar.xz=623bb9617963c109733c1f09be4e6ad647156e49179a2eb2cde91592c45d9b5a
+dist/2024-08-08/rust-std-1.80.1-arm-unknown-linux-musleabihf.tar.gz=b5842fa25c4a9a82498bb498b159b885663790db8a2e6706518c2ce284af8626
+dist/2024-08-08/rust-std-1.80.1-arm-unknown-linux-musleabihf.tar.xz=a144f885daeacb67df4adb524cc0ca43dfb1f18725407dde598064ab5bf9325d
+dist/2024-08-08/rust-std-1.80.1-armv5te-unknown-linux-musleabi.tar.gz=b09b32487b09688e627db734c7541ce32507f782635dbe2bc00f2b6b67a7072c
+dist/2024-08-08/rust-std-1.80.1-armv5te-unknown-linux-musleabi.tar.xz=89b9a9e0ccd4b1540ea7664acd4269f54314dc6b3df748f78bcd2736b6c3b793
+dist/2024-08-08/rust-std-1.80.1-armv7-unknown-linux-ohos.tar.gz=c2166a90121d76f94c1b200745bf3df768e50f41e393ea09d6f28c0f095ac7bf
+dist/2024-08-08/rust-std-1.80.1-armv7-unknown-linux-ohos.tar.xz=3a3c73b1e73a23baebf93247d89e1d578df3e1c1c7a7a128d00c3adb35671797
+dist/2024-08-08/rust-std-1.80.1-loongarch64-unknown-none.tar.gz=ee068fc84ba1e93676300c2691ea18be5fdc0a31cfaf1967784be0340c9ce41f
+dist/2024-08-08/rust-std-1.80.1-loongarch64-unknown-none.tar.xz=c7d713e644dab60db24f98c1517a474ce85dbca7a5fbe394c3372ddabeb83e32
+dist/2024-08-08/rust-std-1.80.1-armv7-unknown-linux-musleabi.tar.gz=e3118e98fe0f1cda7fc5139498cf1b50ad3795917007e1e89410a8b9c370c128
+dist/2024-08-08/rust-std-1.80.1-armv7-unknown-linux-musleabi.tar.xz=99fa7e5ef4098735d09bd9a08987e4c74efe04081b09aa209568946e2fe21a8e
+dist/2024-08-08/rust-std-1.80.1-armebv7r-none-eabihf.tar.gz=bef23d705c69f4656ab49c652b29266aec314c0d5d5203d8f5e3d6ee325563b9
+dist/2024-08-08/rust-std-1.80.1-armebv7r-none-eabihf.tar.xz=b4cc24ccea317177bdfcb880d1a32009df0007d8b9d6f513522a929e1dd8e27e
+dist/2024-08-08/rust-std-1.80.1-x86_64-unknown-linux-gnux32.tar.gz=c3e029420d7955d396fae127e778810a410b081b12659b897c066855de1b38c4
+dist/2024-08-08/rust-std-1.80.1-x86_64-unknown-linux-gnux32.tar.xz=14b610198e306f597271206ac421cf86a9f458d9e919535f91fc1f92c4167379
+dist/2024-08-08/rust-std-1.80.1-riscv32im-unknown-none-elf.tar.gz=43a8b0b60de66f6842bc3abee2f983661052ed200e90031838332840a4af19d9
+dist/2024-08-08/rust-std-1.80.1-riscv32im-unknown-none-elf.tar.xz=2e351b39b1cc22abe9c071f09251f55732fc2e2b2ae47a906dfe1c4eca7a82bb
+dist/2024-08-08/rust-std-1.80.1-x86_64-pc-windows-msvc.tar.gz=2aa0d63a48840a55b7a1edda9cbb9e5f0d560db91c7e54f1a49db23cd6457397
+dist/2024-08-08/rust-std-1.80.1-x86_64-pc-windows-msvc.tar.xz=d17b5ca12b065db1292cef338c0c23e32a59f68ea44012f7a86a6c8671329da5
+dist/2024-08-08/rust-std-1.80.1-powerpc64-unknown-linux-gnu.tar.gz=e788519ba539c63be6fbb1e6e72f8e1f6a53e089561bfdbcea99f43890e75de9
+dist/2024-08-08/rust-std-1.80.1-powerpc64-unknown-linux-gnu.tar.xz=cb5ad871a0a7efe7c270cbf319d006a84e8f8526acb22ce941f2840fd0e368c2
+dist/2024-08-08/rust-std-1.80.1-x86_64-unknown-uefi.tar.gz=7df57e65c355de72115cc331a0f2085f2c4c1bc30918db0d73cd1c8900a6a6b8
+dist/2024-08-08/rust-std-1.80.1-x86_64-unknown-uefi.tar.xz=450843d3ce4dc08f458aef92b32ab14fd760dbb3f78488673b7d13ac0b7ddcfc
+dist/2024-08-08/rust-std-1.80.1-riscv32imac-unknown-none-elf.tar.gz=31fb1954199cc85225455f6e38813dc157442d8a23283ba55d863c5b69b00a84
+dist/2024-08-08/rust-std-1.80.1-riscv32imac-unknown-none-elf.tar.xz=8d5de216c76ed6c6b63cf5956b7826f71e5f3740bbf22571c7d71482d0ea75c3
+dist/2024-08-08/rust-std-1.80.1-sparcv9-sun-solaris.tar.gz=3b1b1c74df623a7d708a001968f9669e87de1d1616c1f6873abfeed7bb220fa6
+dist/2024-08-08/rust-std-1.80.1-sparcv9-sun-solaris.tar.xz=e41a79a7069153455611c71dd6fab2a5e89b7715b0899dd48c0c5e240aa1af22
+dist/2024-08-08/rust-std-1.80.1-aarch64-apple-darwin.tar.gz=7da7be82dd9e6697829e271feaa5898a089721e5b52bac764e3672472dd69081
+dist/2024-08-08/rust-std-1.80.1-aarch64-apple-darwin.tar.xz=b64f95fd458f3fbb6bf006da87762b9cf2f7ed6dae6e33a272851e8162f0b64f
+dist/2024-08-08/rust-std-1.80.1-i686-unknown-uefi.tar.gz=f79bfb811e30dc066f4303482c2b9419d0155e43aa6737d96f039c94ad61d1c4
+dist/2024-08-08/rust-std-1.80.1-i686-unknown-uefi.tar.xz=bd60272351e1340e99c73788318431df1f419f03989e15c4e6e7658c63ca6dcd
+dist/2024-08-08/rust-std-1.80.1-aarch64-unknown-linux-gnu.tar.gz=2465f0df2ee35d32bd9690e05dd84d9c38bf81e8a5e9fd940d7347b66447c97f
+dist/2024-08-08/rust-std-1.80.1-aarch64-unknown-linux-gnu.tar.xz=8fc4bfc3a5fe64f8530964a5ea3bda95e39357eff14d6a8bb24f010ecc912923
+dist/2024-08-08/rust-std-1.80.1-x86_64-unknown-linux-musl.tar.gz=097f6610f9000f29af4b261b49c82251eefd2991ba52249e67922cc63854a63e
+dist/2024-08-08/rust-std-1.80.1-x86_64-unknown-linux-musl.tar.xz=c5b9d3914a129cfc7618a3e9c5d282821da2fb402a6305833d43674c41d303b2
+dist/2024-08-08/rust-std-1.80.1-thumbv8m.main-none-eabi.tar.gz=3b302903a9674a27154db4e9b8ef31adff573deb0cfc54dfebad945be28eee75
+dist/2024-08-08/rust-std-1.80.1-thumbv8m.main-none-eabi.tar.xz=3894c2ad88baf92085c047280f1a83513bafe489b2052412881e9e25eddaa6b6
+dist/2024-08-08/rust-std-1.80.1-armv7a-none-eabi.tar.gz=f47defcd8b83c87599d78a319417b3c32119a0ae6a3cfc56c1493fe9f8abc757
+dist/2024-08-08/rust-std-1.80.1-armv7a-none-eabi.tar.xz=4ff4a1cb29d36e1c3436fbc3a84fa3d48665e4d4a574ef7998db1960c2058019
+dist/2024-08-08/rust-std-1.80.1-i686-unknown-linux-gnu.tar.gz=2e37cf2ccd7ea7ea96164924d5d430d5b7ab274b0d57d7c2802486025f3279ce
+dist/2024-08-08/rust-std-1.80.1-i686-unknown-linux-gnu.tar.xz=6547876dcf243aeeeadaa38dbdce02c316b6f83305a5337520e02eaffc90834b
+dist/2024-08-08/rust-std-1.80.1-armebv7r-none-eabi.tar.gz=d2a1e7f4c086cf21e59b44420068685497dafc6f570fe782d6d9de0b3f2d4d6a
+dist/2024-08-08/rust-std-1.80.1-armebv7r-none-eabi.tar.xz=f207a83316599e6d9f7be9600e3f508242ffd93e3bba8b2fe073f78fc2360a13
+dist/2024-08-08/rust-std-1.80.1-aarch64-unknown-linux-ohos.tar.gz=f9cbd2294d8f961e9d2ce521d7ca43b5ea5a59aa6a08661941231e73617cf36b
+dist/2024-08-08/rust-std-1.80.1-aarch64-unknown-linux-ohos.tar.xz=5d4bbdefe8462905df71bc4362fc988eb6ee424f639e831ca0d53d0d068d8f2a
+dist/2024-08-08/rust-std-1.80.1-i686-pc-windows-msvc.tar.gz=61fc92b71d0ae0af59dfd8a41db7efd2f3a65ad3759fd0dc7bb6e7f95ac4133d
+dist/2024-08-08/rust-std-1.80.1-i686-pc-windows-msvc.tar.xz=f3f1e597f41398193f3df2cf20d9741464433ef94fb3cbfaa06a7192b30a3100
+dist/2024-08-08/rust-std-1.80.1-aarch64-linux-android.tar.gz=4bed3d4db02bb67e1c420df3364ef9c39951f252d4f3a31559711bf8bba9176e
+dist/2024-08-08/rust-std-1.80.1-aarch64-linux-android.tar.xz=8cfc0f41cf3b4222a5884b8a32d45f0b7f23b4ae040ef02d13c7d4a238586463
+dist/2024-08-08/rust-std-1.80.1-wasm32-wasip1-threads.tar.gz=1ae1ca1fa3f2810a4b8683b1497c119e1f0b42a8692c02ddb92aaeea6e9b1670
+dist/2024-08-08/rust-std-1.80.1-wasm32-wasip1-threads.tar.xz=37e4660b885d9caae9887180522fcd41462b289666e26df8d809827ef80b8221
+dist/2024-08-08/rust-std-1.80.1-i586-unknown-linux-gnu.tar.gz=b5b303d3673db0c00aff089f6da4bc7c37614a38d1a9a599fdda7045d5e58f4b
+dist/2024-08-08/rust-std-1.80.1-i586-unknown-linux-gnu.tar.xz=94927cdfa7cad391700b1a77730bb17aa364831ff6a6c40ce6500a14c1314647
+dist/2024-08-08/rust-std-1.80.1-i686-unknown-linux-musl.tar.gz=fc4fb26fc28171e3c8b6f47645bf1d3c5b61fdc506b73a565719b178fe6ddf86
+dist/2024-08-08/rust-std-1.80.1-i686-unknown-linux-musl.tar.xz=329f1bd3a0543822038d55219c74b1168eaab2c5fbcf6baa8a8768cfa133c625
+dist/2024-08-08/rust-std-1.80.1-arm-unknown-linux-musleabi.tar.gz=349cb8b03047d68c3d24fcdb16386be3e10c0159fcdfe2f6ab37b79e871f1963
+dist/2024-08-08/rust-std-1.80.1-arm-unknown-linux-musleabi.tar.xz=1460617746d7e1792005f5378450d47d13db2d08cbc6c1102750ac7f49fc148f
+dist/2024-08-08/rust-std-1.80.1-powerpc64le-unknown-linux-gnu.tar.gz=a3e397035a8b22f7750a899d453cbd9af4138a8b03483598c0cbfd2792940968
+dist/2024-08-08/rust-std-1.80.1-powerpc64le-unknown-linux-gnu.tar.xz=06633b26384cba594424ec02acf0d64d4724033a856a2e039a18a518cacf1d3e
+dist/2024-08-08/rust-std-1.80.1-loongarch64-unknown-linux-gnu.tar.gz=5adb9937240f7d6cbf5c44fc42b5c80a583dae682bc7d5d75ee997ed047fdf56
+dist/2024-08-08/rust-std-1.80.1-loongarch64-unknown-linux-gnu.tar.xz=68f30f3743b573e205ecc1733e1250ffb8d8d81e131c3b2f4a819b7e1e610d62
+dist/2024-08-08/rust-std-1.80.1-i586-unknown-linux-musl.tar.gz=cd3c390bf250408d3af598bdba0b09bbdb3b9d15c42a52cf9d45630b51ec0fa2
+dist/2024-08-08/rust-std-1.80.1-i586-unknown-linux-musl.tar.xz=abefa57c02dbc1c04d1f5130714d64370245b251636d34b54bf9ee0875bca835
+dist/2024-08-08/rust-std-1.80.1-thumbv7m-none-eabi.tar.gz=7ff85d3230f82ecffee88e7dcc174ae14337dff0985dd6b040aee8ca55d62db3
+dist/2024-08-08/rust-std-1.80.1-thumbv7m-none-eabi.tar.xz=5562eb3611379b4fc47568a55a16483cac59e8540d673f14c50c04433cebe188
+dist/2024-08-08/rust-std-1.80.1-x86_64-unknown-illumos.tar.gz=3bf85da6536938e0e5be34b985ebdb7aa10e794ba9307618615b6bc17464d64e
+dist/2024-08-08/rust-std-1.80.1-x86_64-unknown-illumos.tar.xz=fa739c1c5c8e222511d0af6a71caf99b9b0ce2990d1c9acee5ea1732db548780
+dist/2024-08-08/rust-std-1.80.1-armv7r-none-eabi.tar.gz=0c59c2fdd61aa5c813a75f41464739717dc580f7dda5d98a9d768cb65708874c
+dist/2024-08-08/rust-std-1.80.1-armv7r-none-eabi.tar.xz=9be0bd88a980ebd02597ff8099e257ad8b61e84a13bea21b0ebc0fb3cb807ad2
+dist/2024-08-08/rust-std-1.80.1-sparc64-unknown-linux-gnu.tar.gz=c7f5ce798c62f99965280ffe42c9c3568823cf5bea7e8a6a7688b0da8fa37edb
+dist/2024-08-08/rust-std-1.80.1-sparc64-unknown-linux-gnu.tar.xz=ee7fa0104b019eec22750ac635e699d21dbb5430fc6982c495533900ec568d5b
+dist/2024-08-08/rust-std-1.80.1-x86_64-fortanix-unknown-sgx.tar.gz=77d5012fdf94ed695f9f88de0c77721197c954ddbcfa1bcd5948808f3d5d670b
+dist/2024-08-08/rust-std-1.80.1-x86_64-fortanix-unknown-sgx.tar.xz=ce16ef60722178810bd1cbfb5e23d722d592631f9478cb47498062ee78efae91
+dist/2024-08-08/rust-std-1.80.1-aarch64-unknown-uefi.tar.gz=bd9fa8692389a7230d83c8f5e41531bdcc91210a9011afc16e916300e31ecd8e
+dist/2024-08-08/rust-std-1.80.1-aarch64-unknown-uefi.tar.xz=09906dc8629fcbc1831eafebac11d6611d764c5e36cc79e4b47da6434d9df8ae
+dist/2024-08-08/cargo-1.80.1-loongarch64-unknown-linux-gnu.tar.gz=286ba082e9caa7bf14e4fa19cf4b55ee19c6206082531faf2356266f9cf3e7e0
+dist/2024-08-08/cargo-1.80.1-loongarch64-unknown-linux-gnu.tar.xz=843272f7ab9b2f8c24f1747249275e0472fb2ede90f3a404e897559ddb898c18
+dist/2024-08-08/cargo-1.80.1-i686-pc-windows-gnu.tar.gz=0215e8eb1a7ba7e28eb9b51f0d7daa9f3c75dc05e4cac837297a9ee6e3da1b15
+dist/2024-08-08/cargo-1.80.1-i686-pc-windows-gnu.tar.xz=0be97177242e800d24d55ea8cec813b497b58d5b7556b5eec7efded15001f180
+dist/2024-08-08/cargo-1.80.1-x86_64-apple-darwin.tar.gz=3356b40035d8d0792818c1ae0e93409953211d3a0bc84c648142face964324b0
+dist/2024-08-08/cargo-1.80.1-x86_64-apple-darwin.tar.xz=7b1ea55879de5ef926c752fbf7b426756374724b580ea3396d1d1fb021d8b2b9
+dist/2024-08-08/cargo-1.80.1-i686-pc-windows-msvc.tar.gz=dc13c10ad1ca810ccefaf733e81e441863638ea4fe3dca5de1cc126eacfb3da8
+dist/2024-08-08/cargo-1.80.1-i686-pc-windows-msvc.tar.xz=8fb41ba042581aa4d24117ca56184b46f99ad1853183f1ed50faf17e60ba2290
+dist/2024-08-08/cargo-1.80.1-powerpc64le-unknown-linux-gnu.tar.gz=a7025c268a924ad73432d2ddb7ba3f7886bf48aa162fd16d632db8a1a7c519ed
+dist/2024-08-08/cargo-1.80.1-powerpc64le-unknown-linux-gnu.tar.xz=a523cf21d751be597a19830136e3479b7f22d3642d95f53f78a11e770d971d28
+dist/2024-08-08/cargo-1.80.1-powerpc-unknown-linux-gnu.tar.gz=1228690b2bbaa0d458c289126ff70d02a49f528237b7e02af980f3dde8495af6
+dist/2024-08-08/cargo-1.80.1-powerpc-unknown-linux-gnu.tar.xz=a88402d95f2959caaff20037144d3109a69ce3310e1dfbb27231dacd50fa2988
+dist/2024-08-08/cargo-1.80.1-i686-unknown-linux-gnu.tar.gz=4fa720198845ccc08bb463e3c66ecec90f25942a4f97e9b6dc15049278907823
+dist/2024-08-08/cargo-1.80.1-i686-unknown-linux-gnu.tar.xz=b0f6d95c8a292b1276f30b1bca14197b28297c2fcd51974ef320d05497be3ca3
+dist/2024-08-08/cargo-1.80.1-riscv64gc-unknown-linux-gnu.tar.gz=aca037da67716e9be546290b89fc1d4dcfc438b917841d90d3c42caa03fab066
+dist/2024-08-08/cargo-1.80.1-riscv64gc-unknown-linux-gnu.tar.xz=29e996af02293562f6ee79032a5414fffbf77e75cb7f0ba89053849986cb6303
+dist/2024-08-08/cargo-1.80.1-aarch64-unknown-linux-gnu.tar.gz=408fa85f211781c176c5f81b5272ef3ef0a84a71191c092c8a9f047ac110cf7c
+dist/2024-08-08/cargo-1.80.1-aarch64-unknown-linux-gnu.tar.xz=a8c4f1ab2f65e7579eb80153fd1ca9a0b365ca31ca6ae0ebd34156e0724dfc60
+dist/2024-08-08/cargo-1.80.1-x86_64-pc-windows-gnu.tar.gz=2906b3f246ecfbba4f3072ff9bb61ff510c332e7358b72dea40cdbb844b7cf7b
+dist/2024-08-08/cargo-1.80.1-x86_64-pc-windows-gnu.tar.xz=b6cc0754ae8c69ae6580ffd680f01edbd67906377cba407cfff2836ff440c446
+dist/2024-08-08/cargo-1.80.1-aarch64-pc-windows-msvc.tar.gz=d54a15e04ae4f1953f9c31da73e596864d17f4cda2a86f03b57b3fd48df9be77
+dist/2024-08-08/cargo-1.80.1-aarch64-pc-windows-msvc.tar.xz=b108f9e2ad160432d9169dcd5ae0c83c0df73305aa77c7307c7da08c2223ba17
+dist/2024-08-08/cargo-1.80.1-aarch64-unknown-linux-musl.tar.gz=372ca936f1bf1303d65a9a4e51c2b107ebcf89e209a2f780e4aa6b5227ce8776
+dist/2024-08-08/cargo-1.80.1-aarch64-unknown-linux-musl.tar.xz=3337c37bd927a688d4a64e8f30354af89e8dd6274f9febb35906f86bf2942737
+dist/2024-08-08/cargo-1.80.1-arm-unknown-linux-gnueabi.tar.gz=6898fd5d51807513710e1df02dac0d10db0a895e90d8117ce4eee603ea9a242d
+dist/2024-08-08/cargo-1.80.1-arm-unknown-linux-gnueabi.tar.xz=c8383f46dd363acfb022f8c9c2049ca86490a6cea0dbf53fd5c686c7275286e4
+dist/2024-08-08/cargo-1.80.1-aarch64-apple-darwin.tar.gz=effbc189e39d518fbbd2a67cc8e5f0fd6f0c1cf45f058fa667b30eed1b4a99b7
+dist/2024-08-08/cargo-1.80.1-aarch64-apple-darwin.tar.xz=81e5940945d4e5ab698aa9e2a8a6655295963decbdd5cb9cae8a04acf0472d39
+dist/2024-08-08/cargo-1.80.1-x86_64-unknown-freebsd.tar.gz=06a73110386e242d43d49610acec67fb96508839f9dffa0121f62228e3171912
+dist/2024-08-08/cargo-1.80.1-x86_64-unknown-freebsd.tar.xz=d55d5ff1d99b542e8dc5f68914d1266c6dfe313c50f677aafaf582d68d580066
+dist/2024-08-08/cargo-1.80.1-powerpc64-unknown-linux-gnu.tar.gz=b115760bbeef3f1d382538f99fa6b412d30f8397224a179bde48de868460af7a
+dist/2024-08-08/cargo-1.80.1-powerpc64-unknown-linux-gnu.tar.xz=be2707eaa24f34775c98044f92c391a2c6037a2214adab9e83c62903001fb577
+dist/2024-08-08/cargo-1.80.1-arm-unknown-linux-gnueabihf.tar.gz=d8d98791aa29deeafc29f5a6b2c8191d058d83c73c25a41f67601967629c621d
+dist/2024-08-08/cargo-1.80.1-arm-unknown-linux-gnueabihf.tar.xz=2263a9b81f388a66d204214dd02c6c29dc7b27dbf18803797431a6a87bf53213
+dist/2024-08-08/cargo-1.80.1-x86_64-unknown-illumos.tar.gz=5ebb77ac7f690f9ef166dac5c47ba114205937addd86d1be7aca6af0aa9db0d1
+dist/2024-08-08/cargo-1.80.1-x86_64-unknown-illumos.tar.xz=ab3c9e511b3df4505804dffc236017cfbfe528f9ac0fdf89fa763179f5424e30
+dist/2024-08-08/cargo-1.80.1-x86_64-unknown-linux-musl.tar.gz=a7f077240edcbff012da9d5cbbef5e69e451bc5274fceff601e54d8c078f261b
+dist/2024-08-08/cargo-1.80.1-x86_64-unknown-linux-musl.tar.xz=0abddee763bf4f5561e883102a09d35237f5f503027c0e78fbf2a201c95a37ce
+dist/2024-08-08/cargo-1.80.1-armv7-unknown-linux-gnueabihf.tar.gz=fc395b942c4290f189f6f09ed4ef73964762e7ae736c62f54afe12a5289bdfa0
+dist/2024-08-08/cargo-1.80.1-armv7-unknown-linux-gnueabihf.tar.xz=4fb37e94fe772aa9ba6cd470d26bcd6f86377caa0fa666ad3813281fb79cc91f
+dist/2024-08-08/cargo-1.80.1-s390x-unknown-linux-gnu.tar.gz=f1e496c00d111214f6214fc0ef5070862b547602d71926568a01fb1ec15ca349
+dist/2024-08-08/cargo-1.80.1-s390x-unknown-linux-gnu.tar.xz=0c22278b4e8afa79de0cae798575c9ef258e73d0555b18a84efd5d042c69c6e2
+dist/2024-08-08/cargo-1.80.1-x86_64-unknown-linux-gnu.tar.gz=67c9c24442879316f42cd77ef8f680979a0a100557c563e2ff5a58588f67b36f
+dist/2024-08-08/cargo-1.80.1-x86_64-unknown-linux-gnu.tar.xz=da9340b3249f08656cd4fe10e47aa292c7cd79903870a5863064731a00b5b27e
+dist/2024-08-08/cargo-1.80.1-x86_64-unknown-netbsd.tar.gz=0b6319afd9602cb1886853d7783a7c6413c135a55f367ca22c02b856493ff349
+dist/2024-08-08/cargo-1.80.1-x86_64-unknown-netbsd.tar.xz=bc1ea45641c5247cd8fb93b3b209ec72490c7e269e6792e7fe9edba77c92ba94
+dist/2024-08-08/cargo-1.80.1-x86_64-pc-windows-msvc.tar.gz=e01298bde4288abcbcb0baf42bfc17617022243a94600277b54279bb7b32a486
+dist/2024-08-08/cargo-1.80.1-x86_64-pc-windows-msvc.tar.xz=305643131dd31254f81e0b2d451455917e85ffe6528d0ac93897e2e9a7db65fc
+dist/2024-08-08/clippy-1.80.1-armv7-unknown-linux-gnueabihf.tar.gz=398fd0062e409e392d302c12492aff4b64885f3c8b5ef2e8685b40697665d505
+dist/2024-08-08/clippy-1.80.1-armv7-unknown-linux-gnueabihf.tar.xz=6a089fdebc7df8e26ebbf76bd7fcf8b273c51effa83b8210c03f174b23fbbeed
+dist/2024-08-08/clippy-1.80.1-x86_64-unknown-linux-musl.tar.gz=897af31e43e0bbe3a9e86c62f5b332b0be5d098022a760a4b0ce51da3086ddab
+dist/2024-08-08/clippy-1.80.1-x86_64-unknown-linux-musl.tar.xz=620988c7b9c0c3808b3e92b95cfe3a790bcb027e720bd58ba6d76746c6422b7b
+dist/2024-08-08/clippy-1.80.1-x86_64-apple-darwin.tar.gz=47a4691d3083fc321990fc8cab962b9cb441782deee8314116fafc3d08bf37bc
+dist/2024-08-08/clippy-1.80.1-x86_64-apple-darwin.tar.xz=6bd2d1adde613336dc462c2bc98f82724acb14137d2f09190d25c983200a10f1
+dist/2024-08-08/clippy-1.80.1-s390x-unknown-linux-gnu.tar.gz=9bb492aba371c1e7801222c74a013467ee168707729b8c68782c7806206c87f2
+dist/2024-08-08/clippy-1.80.1-s390x-unknown-linux-gnu.tar.xz=52c3368de0e01b07f89f74a4b36279be1b7d2312b05253c7c9ccb50bc38f263a
+dist/2024-08-08/clippy-1.80.1-x86_64-unknown-illumos.tar.gz=f46d7ca34dd6dbf7178176f0344f86e586cd21ebf40380aebd23ac035bd5bfbe
+dist/2024-08-08/clippy-1.80.1-x86_64-unknown-illumos.tar.xz=1e35fd67bc8acd6d955ae2d9ad1208462e9cab71541c494a8fc6664b02fd0001
+dist/2024-08-08/clippy-1.80.1-aarch64-pc-windows-msvc.tar.gz=e471fb4ef06f67b74081e5f55c2049b472de9e6913d38f9c54df94ff6045ce44
+dist/2024-08-08/clippy-1.80.1-aarch64-pc-windows-msvc.tar.xz=9cf8585b222b1e5cd10dfc2bcd972f079686e91f2eae8bcb1792fa22195f69f5
+dist/2024-08-08/clippy-1.80.1-powerpc64-unknown-linux-gnu.tar.gz=34ee8b3593a805ba83bb3fd5c58e6d4dc3c91cbc46377499dd0d9939eb30fc8c
+dist/2024-08-08/clippy-1.80.1-powerpc64-unknown-linux-gnu.tar.xz=a422a3b638c42f26ada441d2940a44a8c0f1ade9459f86d48a3d8fcc866bc60b
+dist/2024-08-08/clippy-1.80.1-i686-pc-windows-msvc.tar.gz=f67b975a27ff60f64d27a6d995f99aff76e3460e5bf0d6f67b68496e43c8a5aa
+dist/2024-08-08/clippy-1.80.1-i686-pc-windows-msvc.tar.xz=299143aaf97ce19773a57261d7412efd15a87930979a1a391dc005edbc2ea95a
+dist/2024-08-08/clippy-1.80.1-riscv64gc-unknown-linux-gnu.tar.gz=8d91d8a463197cefcdd99cd4ccce735abbf94c4aeee94585b04c5b85c58ccb09
+dist/2024-08-08/clippy-1.80.1-riscv64gc-unknown-linux-gnu.tar.xz=24465ce5fe8f04d9b54c31a2c5bcaba6d702925ac3cdec0af5b954643013db90
+dist/2024-08-08/clippy-1.80.1-x86_64-unknown-freebsd.tar.gz=e054e0ffc9f2da09a5a74914ccc2ebf0a6d8d3180357140c8926c2ff3c4497d3
+dist/2024-08-08/clippy-1.80.1-x86_64-unknown-freebsd.tar.xz=da812b6955ae7cb818e59300e3cbefe2ca3951edeabe51fec38344d9b50cafbc
+dist/2024-08-08/clippy-1.80.1-i686-pc-windows-gnu.tar.gz=b6060f9b43158b61c9368133f15061115cf4eb7b6f802b2ee2f20dea263b2dca
+dist/2024-08-08/clippy-1.80.1-i686-pc-windows-gnu.tar.xz=530430c4b043b3bcb0d6c134a354aa4b711d265b78a26e4a5755bfd8e9478e25
+dist/2024-08-08/clippy-1.80.1-x86_64-pc-windows-gnu.tar.gz=bd367f347fb1187557d04d0c31bac3609f8e533438bfc8634e8b41010e91d804
+dist/2024-08-08/clippy-1.80.1-x86_64-pc-windows-gnu.tar.xz=140b22733997fb5b710af98686c640504ce3eea082b44c40a81e495694843e87
+dist/2024-08-08/clippy-1.80.1-x86_64-unknown-linux-gnu.tar.gz=d79814945a59445932c6ecd29649c0d11efc0685a227e6d50622cea331715f3d
+dist/2024-08-08/clippy-1.80.1-x86_64-unknown-linux-gnu.tar.xz=e01d434e952821900f37824c797f87ed16db79e54fcbd2f396b2f1b5cb2e3c55
+dist/2024-08-08/clippy-1.80.1-powerpc-unknown-linux-gnu.tar.gz=789691204a86179c7f271050104439a30f0aea7ce94b2aff2289908c03b41436
+dist/2024-08-08/clippy-1.80.1-powerpc-unknown-linux-gnu.tar.xz=ae1762dc8fd679d65154d5af9500c7539f55ec9d049ab736a910893d382fd6c0
+dist/2024-08-08/clippy-1.80.1-i686-unknown-linux-gnu.tar.gz=e9eedb9c65402e11e4e1dd9647dc7ee108ae11a33381b1767b414ea5584667fd
+dist/2024-08-08/clippy-1.80.1-i686-unknown-linux-gnu.tar.xz=a6899744ed734dd3a9f59631a943721bfe67ed6273e60dd67e8636820c1bfffd
+dist/2024-08-08/clippy-1.80.1-aarch64-unknown-linux-musl.tar.gz=cba64640fde472a8150736f4ef80cecf750de7138551e79edcdd5b218f711308
+dist/2024-08-08/clippy-1.80.1-aarch64-unknown-linux-musl.tar.xz=93f40a87d9e905cd0bbe335fdb34c313be0d80f22506f6bdd3c06a7d36b3456f
+dist/2024-08-08/clippy-1.80.1-powerpc64le-unknown-linux-gnu.tar.gz=a44d3c77bd06b4ca61d073e361bbf987036cdd182eb146a61fb5887dcc92692e
+dist/2024-08-08/clippy-1.80.1-powerpc64le-unknown-linux-gnu.tar.xz=93ce75f4edf2c3b792714d33e279c5743d9d3ef841f8f2d8a7e76c9c7d74f952
+dist/2024-08-08/clippy-1.80.1-aarch64-apple-darwin.tar.gz=d60f21c86a9cc769b5933f1599b597ff18e4f318ff950a2e9898135e7b5c6bc3
+dist/2024-08-08/clippy-1.80.1-aarch64-apple-darwin.tar.xz=c413198c1b2e1981123a482944da16c295bc732f48c5b23477da2455347aeca1
+dist/2024-08-08/clippy-1.80.1-aarch64-unknown-linux-gnu.tar.gz=f7d6a162dc5a4d10e25c12a98c24750e6302a9c5c73a7773564971ca4177b79d
+dist/2024-08-08/clippy-1.80.1-aarch64-unknown-linux-gnu.tar.xz=3d522172f9797e65c609a640af7f4ac331525150c91f93e41798c5578e9523e9
+dist/2024-08-08/clippy-1.80.1-arm-unknown-linux-gnueabi.tar.gz=924a14bde8cc4d729617b54ce0ef679e912ce7ed34507d3bfd6a9f21c4e85a1e
+dist/2024-08-08/clippy-1.80.1-arm-unknown-linux-gnueabi.tar.xz=3070a93fde0382531ec15b24cf27bad8b0ecf109474781285e56e3a5d7ad2f5b
+dist/2024-08-08/clippy-1.80.1-x86_64-unknown-netbsd.tar.gz=f7524f6b189facf6aa2f4a56c974013c3f5817a8f90c5dd0a9e5eb0c9b98cadb
+dist/2024-08-08/clippy-1.80.1-x86_64-unknown-netbsd.tar.xz=6cdfcc7d4277886316be8a815fdbaad213beed820bc2d9332b97a1f6304a38ac
+dist/2024-08-08/clippy-1.80.1-arm-unknown-linux-gnueabihf.tar.gz=6aa621d9fe780720116493050ae858ecaa6f93c6503be3e19924f90701d87ae2
+dist/2024-08-08/clippy-1.80.1-arm-unknown-linux-gnueabihf.tar.xz=24a7c19a61545fe623d6a9208807d06ea8aa3b5676bf8f632f3696fd8efac1fb
+dist/2024-08-08/clippy-1.80.1-loongarch64-unknown-linux-gnu.tar.gz=4b7c03b52385c3815f042a7be998e7be5e9899d3b63afd3af5b084cca757859b
+dist/2024-08-08/clippy-1.80.1-loongarch64-unknown-linux-gnu.tar.xz=e4dba3b66bd8f811c8508fd3be1bf136b714018768d9f16a96f601ebd375bcc6
+dist/2024-08-08/clippy-1.80.1-x86_64-pc-windows-msvc.tar.gz=7501c07b7a45e14878a1aaeaec66c88fe0fba1cdb6bfe203f1cea987df051b24
+dist/2024-08-08/clippy-1.80.1-x86_64-pc-windows-msvc.tar.xz=e18fcc9105c0f80a299d3676b5d29460ca79fa54dbd867eece306da39710fc8b
\ No newline at end of file
diff --git a/src/tools/clippy/clippy_lints/src/large_stack_arrays.rs b/src/tools/clippy/clippy_lints/src/large_stack_arrays.rs
index d94b0cce94865..c9bfc9c85d958 100644
--- a/src/tools/clippy/clippy_lints/src/large_stack_arrays.rs
+++ b/src/tools/clippy/clippy_lints/src/large_stack_arrays.rs
@@ -106,12 +106,13 @@ fn might_be_expanded<'tcx>(cx: &LateContext<'tcx>, expr: &Expr<'tcx>) -> bool {
///
/// This is a fail-safe to a case where even the `is_from_proc_macro` is unable to determain the
/// correct result.
- fn repeat_expr_might_be_expanded<'tcx>(expr: &Expr<'tcx>) -> bool {
- let ExprKind::Repeat(_, ArrayLen::Body(len_ct)) = expr.kind else {
+ fn repeat_expr_might_be_expanded<'tcx>(cx: &LateContext<'tcx>, expr: &Expr<'tcx>) -> bool {
+ let ExprKind::Repeat(_, ArrayLen::Body(anon_const)) = expr.kind else {
return false;
};
- !expr.span.contains(len_ct.span())
+ let len_span = cx.tcx.def_span(anon_const.def_id);
+ !expr.span.contains(len_span)
}
- expr.span.from_expansion() || is_from_proc_macro(cx, expr) || repeat_expr_might_be_expanded(expr)
+ expr.span.from_expansion() || is_from_proc_macro(cx, expr) || repeat_expr_might_be_expanded(cx, expr)
}
diff --git a/src/tools/clippy/clippy_lints/src/trailing_empty_array.rs b/src/tools/clippy/clippy_lints/src/trailing_empty_array.rs
index db8c63892b84e..462084e96a864 100644
--- a/src/tools/clippy/clippy_lints/src/trailing_empty_array.rs
+++ b/src/tools/clippy/clippy_lints/src/trailing_empty_array.rs
@@ -2,7 +2,7 @@ use clippy_utils::diagnostics::span_lint_and_help;
use clippy_utils::has_repr_attr;
use rustc_hir::{Item, ItemKind};
use rustc_lint::{LateContext, LateLintPass};
-use rustc_middle::ty::{Const, FeedConstTy};
+use rustc_middle::ty::Const;
use rustc_session::declare_lint_pass;
declare_clippy_lint! {
@@ -53,14 +53,14 @@ impl<'tcx> LateLintPass<'tcx> for TrailingEmptyArray {
}
}
-fn is_struct_with_trailing_zero_sized_array<'tcx>(cx: &LateContext<'tcx>, item: &Item<'tcx>) -> bool {
+fn is_struct_with_trailing_zero_sized_array(cx: &LateContext<'_>, item: &Item<'_>) -> bool {
if let ItemKind::Struct(data, _) = &item.kind
// First check if last field is an array
&& let Some(last_field) = data.fields().last()
&& let rustc_hir::TyKind::Array(_, rustc_hir::ArrayLen::Body(length)) = last_field.ty.kind
// Then check if that array is zero-sized
- && let length = Const::from_const_arg(cx.tcx, length, FeedConstTy::No)
+ && let length = Const::from_anon_const(cx.tcx, length.def_id)
&& let length = length.try_eval_target_usize(cx.tcx, cx.param_env)
&& let Some(length) = length
{
diff --git a/src/tools/clippy/clippy_lints/src/utils/author.rs b/src/tools/clippy/clippy_lints/src/utils/author.rs
index 316c1f32d3a2a..e9d69407df8b5 100644
--- a/src/tools/clippy/clippy_lints/src/utils/author.rs
+++ b/src/tools/clippy/clippy_lints/src/utils/author.rs
@@ -5,9 +5,10 @@ use clippy_utils::{get_attr, higher};
use rustc_ast::ast::{LitFloatType, LitKind};
use rustc_ast::LitIntType;
use rustc_data_structures::fx::FxHashMap;
+use rustc_hir as hir;
use rustc_hir::{
- self as hir, ArrayLen, BindingMode, CaptureBy, Closure, ClosureKind, ConstArg, ConstArgKind, CoroutineKind,
- ExprKind, FnRetTy, HirId, Lit, PatKind, QPath, StmtKind, TyKind,
+ ArrayLen, BindingMode, CaptureBy, Closure, ClosureKind, CoroutineKind, ExprKind, FnRetTy, HirId, Lit, PatKind,
+ QPath, StmtKind, TyKind,
};
use rustc_lint::{LateContext, LateLintPass, LintContext};
use rustc_session::declare_lint_pass;
@@ -269,21 +270,6 @@ impl<'a, 'tcx> PrintVisitor<'a, 'tcx> {
}
}
- fn const_arg(&self, const_arg: &Binding<&ConstArg<'_>>) {
- match const_arg.value.kind {
- ConstArgKind::Path(ref qpath) => {
- bind!(self, qpath);
- chain!(self, "let ConstArgKind::Path(ref {qpath}) = {const_arg}.kind");
- self.qpath(qpath);
- },
- ConstArgKind::Anon(anon_const) => {
- bind!(self, anon_const);
- chain!(self, "let ConstArgKind::Anon({anon_const}) = {const_arg}.kind");
- self.body(field!(anon_const.body));
- },
- }
- }
-
fn lit(&self, lit: &Binding<&Lit>) {
let kind = |kind| chain!(self, "let LitKind::{kind} = {lit}.node");
macro_rules! kind {
@@ -616,10 +602,10 @@ impl<'a, 'tcx> PrintVisitor<'a, 'tcx> {
self.expr(value);
match length.value {
ArrayLen::Infer(..) => chain!(self, "let ArrayLen::Infer(..) = length"),
- ArrayLen::Body(const_arg) => {
- bind!(self, const_arg);
- chain!(self, "let ArrayLen::Body({const_arg}) = {length}");
- self.const_arg(const_arg);
+ ArrayLen::Body(anon_const) => {
+ bind!(self, anon_const);
+ chain!(self, "let ArrayLen::Body({anon_const}) = {length}");
+ self.body(field!(anon_const.body));
},
}
},
diff --git a/src/tools/clippy/clippy_utils/src/hir_utils.rs b/src/tools/clippy/clippy_utils/src/hir_utils.rs
index 6c6a237a8b161..8706cec5d388a 100644
--- a/src/tools/clippy/clippy_utils/src/hir_utils.rs
+++ b/src/tools/clippy/clippy_utils/src/hir_utils.rs
@@ -7,9 +7,9 @@ use rustc_data_structures::fx::FxHasher;
use rustc_hir::def::Res;
use rustc_hir::MatchSource::TryDesugar;
use rustc_hir::{
- ArrayLen, AssocItemConstraint, BinOpKind, BindingMode, Block, BodyId, Closure, ConstArg, ConstArgKind, Expr,
- ExprField, ExprKind, FnRetTy, GenericArg, GenericArgs, HirId, HirIdMap, InlineAsmOperand, LetExpr, Lifetime,
- LifetimeName, Pat, PatField, PatKind, Path, PathSegment, PrimTy, QPath, Stmt, StmtKind, Ty, TyKind,
+ ArrayLen, AssocItemConstraint, BinOpKind, BindingMode, Block, BodyId, Closure, Expr, ExprField, ExprKind, FnRetTy,
+ GenericArg, GenericArgs, HirId, HirIdMap, InlineAsmOperand, LetExpr, Lifetime, LifetimeName, Pat, PatField,
+ PatKind, Path, PathSegment, PrimTy, QPath, Stmt, StmtKind, Ty, TyKind,
};
use rustc_lexer::{tokenize, TokenKind};
use rustc_lint::LateContext;
@@ -227,7 +227,7 @@ impl HirEqInterExpr<'_, '_, '_> {
pub fn eq_array_length(&mut self, left: ArrayLen<'_>, right: ArrayLen<'_>) -> bool {
match (left, right) {
(ArrayLen::Infer(..), ArrayLen::Infer(..)) => true,
- (ArrayLen::Body(l_ct), ArrayLen::Body(r_ct)) => self.eq_const_arg(l_ct, r_ct),
+ (ArrayLen::Body(l_ct), ArrayLen::Body(r_ct)) => self.eq_body(l_ct.body, r_ct.body),
(_, _) => false,
}
}
@@ -411,7 +411,7 @@ impl HirEqInterExpr<'_, '_, '_> {
fn eq_generic_arg(&mut self, left: &GenericArg<'_>, right: &GenericArg<'_>) -> bool {
match (left, right) {
- (GenericArg::Const(l), GenericArg::Const(r)) => self.eq_const_arg(l, r),
+ (GenericArg::Const(l), GenericArg::Const(r)) => self.eq_body(l.value.body, r.value.body),
(GenericArg::Lifetime(l_lt), GenericArg::Lifetime(r_lt)) => Self::eq_lifetime(l_lt, r_lt),
(GenericArg::Type(l_ty), GenericArg::Type(r_ty)) => self.eq_ty(l_ty, r_ty),
(GenericArg::Infer(l_inf), GenericArg::Infer(r_inf)) => self.eq_ty(&l_inf.to_ty(), &r_inf.to_ty()),
@@ -419,17 +419,6 @@ impl HirEqInterExpr<'_, '_, '_> {
}
}
- fn eq_const_arg(&mut self, left: &ConstArg<'_>, right: &ConstArg<'_>) -> bool {
- match (&left.kind, &right.kind) {
- (ConstArgKind::Path(l_p), ConstArgKind::Path(r_p)) => self.eq_qpath(l_p, r_p),
- (ConstArgKind::Anon(l_an), ConstArgKind::Anon(r_an)) => self.eq_body(l_an.body, r_an.body),
- // Use explicit match for now since ConstArg is undergoing flux.
- (ConstArgKind::Path(..), ConstArgKind::Anon(..)) | (ConstArgKind::Anon(..), ConstArgKind::Path(..)) => {
- false
- },
- }
- }
-
fn eq_lifetime(left: &Lifetime, right: &Lifetime) -> bool {
left.res == right.res
}
@@ -1134,7 +1123,7 @@ impl<'a, 'tcx> SpanlessHash<'a, 'tcx> {
pub fn hash_array_length(&mut self, length: ArrayLen<'_>) {
match length {
ArrayLen::Infer(..) => {},
- ArrayLen::Body(ct) => self.hash_const_arg(ct),
+ ArrayLen::Body(anon_const) => self.hash_body(anon_const.body),
}
}
@@ -1145,19 +1134,12 @@ impl<'a, 'tcx> SpanlessHash<'a, 'tcx> {
self.maybe_typeck_results = old_maybe_typeck_results;
}
- fn hash_const_arg(&mut self, const_arg: &ConstArg<'_>) {
- match &const_arg.kind {
- ConstArgKind::Path(path) => self.hash_qpath(path),
- ConstArgKind::Anon(anon) => self.hash_body(anon.body),
- }
- }
-
fn hash_generic_args(&mut self, arg_list: &[GenericArg<'_>]) {
for arg in arg_list {
match *arg {
GenericArg::Lifetime(l) => self.hash_lifetime(l),
GenericArg::Type(ty) => self.hash_ty(ty),
- GenericArg::Const(ref ca) => self.hash_const_arg(ca),
+ GenericArg::Const(ref ca) => self.hash_body(ca.value.body),
GenericArg::Infer(ref inf) => self.hash_ty(&inf.to_ty()),
}
}
diff --git a/src/tools/clippy/clippy_utils/src/lib.rs b/src/tools/clippy/clippy_utils/src/lib.rs
index 8c33c34fa1c5d..bdb3b5e45c48d 100644
--- a/src/tools/clippy/clippy_utils/src/lib.rs
+++ b/src/tools/clippy/clippy_utils/src/lib.rs
@@ -102,11 +102,11 @@ use rustc_hir::hir_id::{HirIdMap, HirIdSet};
use rustc_hir::intravisit::{walk_expr, FnKind, Visitor};
use rustc_hir::LangItem::{OptionNone, OptionSome, ResultErr, ResultOk};
use rustc_hir::{
- self as hir, def, Arm, ArrayLen, BindingMode, Block, BlockCheckMode, Body, ByRef, Closure, ConstArgKind,
- ConstContext, Destination, Expr, ExprField, ExprKind, FnDecl, FnRetTy, GenericArgs, HirId, Impl, ImplItem,
- ImplItemKind, ImplItemRef, Item, ItemKind, LangItem, LetStmt, MatchSource, Mutability, Node, OwnerId, OwnerNode,
- Param, Pat, PatKind, Path, PathSegment, PrimTy, QPath, Stmt, StmtKind, TraitItem, TraitItemKind, TraitItemRef,
- TraitRef, TyKind, UnOp,
+ self as hir, def, Arm, ArrayLen, BindingMode, Block, BlockCheckMode, Body, ByRef, Closure, ConstContext,
+ Destination, Expr, ExprField, ExprKind, FnDecl, FnRetTy, GenericArgs, HirId, Impl, ImplItem, ImplItemKind,
+ ImplItemRef, Item, ItemKind, LangItem, LetStmt, MatchSource, Mutability, Node, OwnerId, OwnerNode, Param, Pat,
+ PatKind, Path, PathSegment, PrimTy, QPath, Stmt, StmtKind, TraitItem, TraitItemKind, TraitItemRef, TraitRef,
+ TyKind, UnOp,
};
use rustc_lexer::{tokenize, TokenKind};
use rustc_lint::{LateContext, Level, Lint, LintContext};
@@ -904,8 +904,7 @@ pub fn is_default_equivalent(cx: &LateContext<'_>, e: &Expr<'_>) -> bool {
},
ExprKind::Tup(items) | ExprKind::Array(items) => items.iter().all(|x| is_default_equivalent(cx, x)),
ExprKind::Repeat(x, ArrayLen::Body(len)) => {
- if let ConstArgKind::Anon(anon_const) = len.kind
- && let ExprKind::Lit(const_lit) = cx.tcx.hir().body(anon_const.body).value.kind
+ if let ExprKind::Lit(const_lit) = cx.tcx.hir().body(len.body).value.kind
&& let LitKind::Int(v, _) = const_lit.node
&& v <= 32
&& is_default_equivalent(cx, x)
@@ -934,8 +933,7 @@ fn is_default_equivalent_from(cx: &LateContext<'_>, from_func: &Expr<'_>, arg: &
}) => return sym.is_empty() && is_path_lang_item(cx, ty, LangItem::String),
ExprKind::Array([]) => return is_path_diagnostic_item(cx, ty, sym::Vec),
ExprKind::Repeat(_, ArrayLen::Body(len)) => {
- if let ConstArgKind::Anon(anon_const) = len.kind
- && let ExprKind::Lit(const_lit) = cx.tcx.hir().body(anon_const.body).value.kind
+ if let ExprKind::Lit(const_lit) = cx.tcx.hir().body(len.body).value.kind
&& let LitKind::Int(v, _) = const_lit.node
{
return v == 0 && is_path_diagnostic_item(cx, ty, sym::Vec);
diff --git a/src/tools/clippy/tests/ui/author/repeat.stdout b/src/tools/clippy/tests/ui/author/repeat.stdout
index d9e3f864f12f4..c2a369610cc1b 100644
--- a/src/tools/clippy/tests/ui/author/repeat.stdout
+++ b/src/tools/clippy/tests/ui/author/repeat.stdout
@@ -1,8 +1,7 @@
if let ExprKind::Repeat(value, length) = expr.kind
&& let ExprKind::Lit(ref lit) = value.kind
&& let LitKind::Int(1, LitIntType::Unsigned(UintTy::U8)) = lit.node
- && let ArrayLen::Body(const_arg) = length
- && let ConstArgKind::Anon(anon_const) = const_arg.kind
+ && let ArrayLen::Body(anon_const) = length
&& expr1 = &cx.tcx.hir().body(anon_const.body).value
&& let ExprKind::Lit(ref lit1) = expr1.kind
&& let LitKind::Int(5, LitIntType::Unsuffixed) = lit1.node
diff --git a/src/tools/clippy/tests/ui/min_ident_chars.stderr b/src/tools/clippy/tests/ui/min_ident_chars.stderr
index 7fbd8462fdcce..3dd5c9561fd02 100644
--- a/src/tools/clippy/tests/ui/min_ident_chars.stderr
+++ b/src/tools/clippy/tests/ui/min_ident_chars.stderr
@@ -193,11 +193,5 @@ error: this ident consists of a single char
LL | fn wrong_pythagoras(a: f32, b: f32) -> f32 {
| ^
-error: this ident consists of a single char
- --> tests/ui/min_ident_chars.rs:93:41
- |
-LL | struct Array<T, const N: usize>([T; N]);
- | ^
-
-error: aborting due to 33 previous errors
+error: aborting due to 32 previous errors
diff --git a/tests/crashes/127009.rs b/tests/crashes/127009.rs
deleted file mode 100644
index 74ca14393e4e9..0000000000000
--- a/tests/crashes/127009.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-//@ known-bug: #127009
-
-#![feature(non_lifetime_binders)]
-
-fn b()
-where
- for<const C: usize> [(); C]: Copy,
-{
-}
-
-fn main() {}
diff --git a/tests/mir-opt/jump_threading.floats.JumpThreading.panic-abort.diff b/tests/mir-opt/jump_threading.floats.JumpThreading.panic-abort.diff
new file mode 100644
index 0000000000000..6ca37e96d297b
--- /dev/null
+++ b/tests/mir-opt/jump_threading.floats.JumpThreading.panic-abort.diff
@@ -0,0 +1,59 @@
+- // MIR for `floats` before JumpThreading
++ // MIR for `floats` after JumpThreading
+
+ fn floats() -> u32 {
+ let mut _0: u32;
+ let _1: f64;
+ let mut _2: bool;
+ let mut _3: bool;
+ let mut _4: f64;
+ scope 1 {
+ debug x => _1;
+ }
+
+ bb0: {
+ StorageLive(_1);
+ StorageLive(_2);
+ _2 = const true;
+- switchInt(move _2) -> [0: bb2, otherwise: bb1];
++ goto -> bb1;
+ }
+
+ bb1: {
+ _1 = const -0f64;
+ goto -> bb3;
+ }
+
+ bb2: {
+ _1 = const 1f64;
+ goto -> bb3;
+ }
+
+ bb3: {
+ StorageDead(_2);
+ StorageLive(_3);
+ StorageLive(_4);
+ _4 = _1;
+ _3 = Eq(move _4, const 0f64);
+ switchInt(move _3) -> [0: bb5, otherwise: bb4];
+ }
+
+ bb4: {
+ StorageDead(_4);
+ _0 = const 0_u32;
+ goto -> bb6;
+ }
+
+ bb5: {
+ StorageDead(_4);
+ _0 = const 1_u32;
+ goto -> bb6;
+ }
+
+ bb6: {
+ StorageDead(_3);
+ StorageDead(_1);
+ return;
+ }
+ }
+
diff --git a/tests/mir-opt/jump_threading.floats.JumpThreading.panic-unwind.diff b/tests/mir-opt/jump_threading.floats.JumpThreading.panic-unwind.diff
new file mode 100644
index 0000000000000..6ca37e96d297b
--- /dev/null
+++ b/tests/mir-opt/jump_threading.floats.JumpThreading.panic-unwind.diff
@@ -0,0 +1,59 @@
+- // MIR for `floats` before JumpThreading
++ // MIR for `floats` after JumpThreading
+
+ fn floats() -> u32 {
+ let mut _0: u32;
+ let _1: f64;
+ let mut _2: bool;
+ let mut _3: bool;
+ let mut _4: f64;
+ scope 1 {
+ debug x => _1;
+ }
+
+ bb0: {
+ StorageLive(_1);
+ StorageLive(_2);
+ _2 = const true;
+- switchInt(move _2) -> [0: bb2, otherwise: bb1];
++ goto -> bb1;
+ }
+
+ bb1: {
+ _1 = const -0f64;
+ goto -> bb3;
+ }
+
+ bb2: {
+ _1 = const 1f64;
+ goto -> bb3;
+ }
+
+ bb3: {
+ StorageDead(_2);
+ StorageLive(_3);
+ StorageLive(_4);
+ _4 = _1;
+ _3 = Eq(move _4, const 0f64);
+ switchInt(move _3) -> [0: bb5, otherwise: bb4];
+ }
+
+ bb4: {
+ StorageDead(_4);
+ _0 = const 0_u32;
+ goto -> bb6;
+ }
+
+ bb5: {
+ StorageDead(_4);
+ _0 = const 1_u32;
+ goto -> bb6;
+ }
+
+ bb6: {
+ StorageDead(_3);
+ StorageDead(_1);
+ return;
+ }
+ }
+
diff --git a/tests/mir-opt/jump_threading.rs b/tests/mir-opt/jump_threading.rs
index de290c1ef4473..e5d8525dcac13 100644
--- a/tests/mir-opt/jump_threading.rs
+++ b/tests/mir-opt/jump_threading.rs
@@ -521,6 +521,16 @@ fn aggregate_copy() -> u32 {
if c == 2 { b.0 } else { 13 }
}
+fn floats() -> u32 {
+ // CHECK-LABEL: fn floats(
+ // CHECK: switchInt(
+
+ // Test for issue #128243, where float equality was assumed to be bitwise.
+ // When adding float support, it must be ensured that this continues working properly.
+ let x = if true { -0.0 } else { 1.0 };
+ if x == 0.0 { 0 } else { 1 }
+}
+
fn main() {
// CHECK-LABEL: fn main(
too_complex(Ok(0));
@@ -535,6 +545,7 @@ fn main() {
disappearing_bb(7);
aggregate(7);
assume(7, false);
+ floats();
}
// EMIT_MIR jump_threading.too_complex.JumpThreading.diff
@@ -550,3 +561,4 @@ fn main() {
// EMIT_MIR jump_threading.aggregate.JumpThreading.diff
// EMIT_MIR jump_threading.assume.JumpThreading.diff
// EMIT_MIR jump_threading.aggregate_copy.JumpThreading.diff
+// EMIT_MIR jump_threading.floats.JumpThreading.diff
diff --git a/tests/ui-fulldeps/stable-mir/check_instance.rs b/tests/ui-fulldeps/stable-mir/check_instance.rs
index 5e3f255756643..f971426723f25 100644
--- a/tests/ui-fulldeps/stable-mir/check_instance.rs
+++ b/tests/ui-fulldeps/stable-mir/check_instance.rs
@@ -33,7 +33,7 @@ fn test_stable_mir() -> ControlFlow<()> {
// Get all items and split generic vs monomorphic items.
let (generic, mono): (Vec<_>, Vec<_>) =
items.into_iter().partition(|item| item.requires_monomorphization());
- assert_eq!(mono.len(), 3, "Expected 3 mono functions");
+ assert_eq!(mono.len(), 4, "Expected 2 mono functions and one constant");
assert_eq!(generic.len(), 2, "Expected 2 generic functions");
// For all monomorphic items, get the correspondent instances.
diff --git a/tests/ui/cast/dyn-tails-need-normalization.rs b/tests/ui/cast/dyn-tails-need-normalization.rs
new file mode 100644
index 0000000000000..719e0e892430d
--- /dev/null
+++ b/tests/ui/cast/dyn-tails-need-normalization.rs
@@ -0,0 +1,21 @@
+//@ check-pass
+
+trait Trait {
+ type Associated;
+}
+
+impl Trait for i32 {
+ type Associated = i64;
+}
+
+trait Generic<T> {}
+
+type TraitObject = dyn Generic<<i32 as Trait>::Associated>;
+
+struct Wrap(TraitObject);
+
+fn cast(x: *mut TraitObject) {
+ x as *mut Wrap;
+}
+
+fn main() {}
diff --git a/tests/ui/coherence/negative-coherence/generic_const_type_mismatch.rs b/tests/ui/coherence/negative-coherence/generic_const_type_mismatch.rs
index e07fa78463c7d..fa0b0fdc136ac 100644
--- a/tests/ui/coherence/negative-coherence/generic_const_type_mismatch.rs
+++ b/tests/ui/coherence/negative-coherence/generic_const_type_mismatch.rs
@@ -5,7 +5,9 @@
#![feature(with_negative_coherence)]
trait Trait {}
impl<const N: u8> Trait for [(); N] {}
+//~^ ERROR: mismatched types
impl<const N: i8> Trait for [(); N] {}
-//~^ ERROR: conflicting implementations of trait `Trait`
+//~^ ERROR: mismatched types
+//~| ERROR: conflicting implementations of trait `Trait`
fn main() {}
diff --git a/tests/ui/coherence/negative-coherence/generic_const_type_mismatch.stderr b/tests/ui/coherence/negative-coherence/generic_const_type_mismatch.stderr
index 2087be8e7115d..d65450845bc12 100644
--- a/tests/ui/coherence/negative-coherence/generic_const_type_mismatch.stderr
+++ b/tests/ui/coherence/negative-coherence/generic_const_type_mismatch.stderr
@@ -1,11 +1,25 @@
error[E0119]: conflicting implementations of trait `Trait` for type `[(); _]`
- --> $DIR/generic_const_type_mismatch.rs:8:1
+ --> $DIR/generic_const_type_mismatch.rs:9:1
|
LL | impl<const N: u8> Trait for [(); N] {}
| ----------------------------------- first implementation here
+LL |
LL | impl<const N: i8> Trait for [(); N] {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `[(); _]`
-error: aborting due to 1 previous error
+error[E0308]: mismatched types
+ --> $DIR/generic_const_type_mismatch.rs:7:34
+ |
+LL | impl<const N: u8> Trait for [(); N] {}
+ | ^ expected `usize`, found `u8`
+
+error[E0308]: mismatched types
+ --> $DIR/generic_const_type_mismatch.rs:9:34
+ |
+LL | impl<const N: i8> Trait for [(); N] {}
+ | ^ expected `usize`, found `i8`
+
+error: aborting due to 3 previous errors
-For more information about this error, try `rustc --explain E0119`.
+Some errors have detailed explanations: E0119, E0308.
+For more information about an error, try `rustc --explain E0119`.
diff --git a/tests/ui/const-generics/bad-subst-const-kind.rs b/tests/ui/const-generics/bad-subst-const-kind.rs
index cc2ff9b8dea07..d5913879191ef 100644
--- a/tests/ui/const-generics/bad-subst-const-kind.rs
+++ b/tests/ui/const-generics/bad-subst-const-kind.rs
@@ -6,7 +6,7 @@ trait Q {
}
impl<const N: u64> Q for [u8; N] {
- //~^ ERROR: the constant `N` is not of type `usize`
+ //~^ ERROR mismatched types
const ASSOC: usize = 1;
}
diff --git a/tests/ui/const-generics/bad-subst-const-kind.stderr b/tests/ui/const-generics/bad-subst-const-kind.stderr
index 5c8d9c9036356..6725f6762e45d 100644
--- a/tests/ui/const-generics/bad-subst-const-kind.stderr
+++ b/tests/ui/const-generics/bad-subst-const-kind.stderr
@@ -1,9 +1,3 @@
-error: the constant `N` is not of type `usize`
- --> $DIR/bad-subst-const-kind.rs:8:26
- |
-LL | impl<const N: u64> Q for [u8; N] {
- | ^^^^^^^ expected `usize`, found `u64`
-
error: the constant `13` is not of type `u64`
--> $DIR/bad-subst-const-kind.rs:13:24
|
@@ -18,5 +12,12 @@ LL | impl<const N: u64> Q for [u8; N] {
| |
| unsatisfied trait bound introduced here
+error[E0308]: mismatched types
+ --> $DIR/bad-subst-const-kind.rs:8:31
+ |
+LL | impl<const N: u64> Q for [u8; N] {
+ | ^ expected `usize`, found `u64`
+
error: aborting due to 2 previous errors
+For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/const-generics/generic_const_exprs/type_mismatch.rs b/tests/ui/const-generics/generic_const_exprs/type_mismatch.rs
index 8e5e23b233718..6b0d9e047dbc3 100644
--- a/tests/ui/const-generics/generic_const_exprs/type_mismatch.rs
+++ b/tests/ui/const-generics/generic_const_exprs/type_mismatch.rs
@@ -7,7 +7,7 @@ trait Q {
impl<const N: u64> Q for [u8; N] {}
//~^ ERROR not all trait items implemented
-//~| ERROR the constant `N` is not of type `usize`
+//~| ERROR mismatched types
pub fn q_user() -> [u8; <[u8; 13] as Q>::ASSOC] {}
//~^ ERROR the constant `13` is not of type `u64`
diff --git a/tests/ui/const-generics/generic_const_exprs/type_mismatch.stderr b/tests/ui/const-generics/generic_const_exprs/type_mismatch.stderr
index e03580ec007ca..bb6d650b7ab27 100644
--- a/tests/ui/const-generics/generic_const_exprs/type_mismatch.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/type_mismatch.stderr
@@ -1,9 +1,3 @@
-error: the constant `N` is not of type `usize`
- --> $DIR/type_mismatch.rs:8:26
- |
-LL | impl<const N: u64> Q for [u8; N] {}
- | ^^^^^^^ expected `usize`, found `u64`
-
error[E0046]: not all trait items implemented, missing: `ASSOC`
--> $DIR/type_mismatch.rs:8:1
|
@@ -35,6 +29,12 @@ LL | pub fn q_user() -> [u8; <[u8; 13] as Q>::ASSOC] {}
| |
| implicitly returns `()` as its body has no tail or `return` expression
+error[E0308]: mismatched types
+ --> $DIR/type_mismatch.rs:8:31
+ |
+LL | impl<const N: u64> Q for [u8; N] {}
+ | ^ expected `usize`, found `u64`
+
error: aborting due to 4 previous errors
Some errors have detailed explanations: E0046, E0308.
diff --git a/tests/ui/const-generics/generic_const_exprs/unevaluated-const-ice-119731.rs b/tests/ui/const-generics/generic_const_exprs/unevaluated-const-ice-119731.rs
index 8b7ee577569a6..51cae20df84d4 100644
--- a/tests/ui/const-generics/generic_const_exprs/unevaluated-const-ice-119731.rs
+++ b/tests/ui/const-generics/generic_const_exprs/unevaluated-const-ice-119731.rs
@@ -25,8 +25,8 @@ mod v20 {
}
impl<const v10: usize> v17<v10, v2> {
- //~^ ERROR maximum number of nodes exceeded in constant v20::v17::<v10, v2>::{constant#0}
- //~| ERROR maximum number of nodes exceeded in constant v20::v17::<v10, v2>::{constant#0}
+ //~^ ERROR maximum number of nodes exceeded in constant v20::v17::<v10, v2>::{constant#1}
+ //~| ERROR maximum number of nodes exceeded in constant v20::v17::<v10, v2>::{constant#1}
pub const fn v21() -> v18 {
//~^ ERROR cannot find type `v18` in this scope
v18 { _p: () }
diff --git a/tests/ui/const-generics/generic_const_exprs/unevaluated-const-ice-119731.stderr b/tests/ui/const-generics/generic_const_exprs/unevaluated-const-ice-119731.stderr
index 15d3c47258525..39f022fbee9db 100644
--- a/tests/ui/const-generics/generic_const_exprs/unevaluated-const-ice-119731.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/unevaluated-const-ice-119731.stderr
@@ -72,13 +72,13 @@ help: add `#![feature(adt_const_params)]` to the crate attributes to enable more
LL + #![feature(adt_const_params)]
|
-error: maximum number of nodes exceeded in constant v20::v17::<v10, v2>::{constant#0}
+error: maximum number of nodes exceeded in constant v20::v17::<v10, v2>::{constant#1}
--> $DIR/unevaluated-const-ice-119731.rs:27:37
|
LL | impl<const v10: usize> v17<v10, v2> {
| ^^
-error: maximum number of nodes exceeded in constant v20::v17::<v10, v2>::{constant#0}
+error: maximum number of nodes exceeded in constant v20::v17::<v10, v2>::{constant#1}
--> $DIR/unevaluated-const-ice-119731.rs:27:37
|
LL | impl<const v10: usize> v17<v10, v2> {
diff --git a/tests/ui/const-generics/issues/issue-88119.stderr b/tests/ui/const-generics/issues/issue-88119.stderr
index b5eec3046fd9e..c17a7d5d9fad0 100644
--- a/tests/ui/const-generics/issues/issue-88119.stderr
+++ b/tests/ui/const-generics/issues/issue-88119.stderr
@@ -1,32 +1,26 @@
-error[E0284]: type annotations needed: cannot normalize `<&T as ConstName>::{constant#0}`
- --> $DIR/issue-88119.rs:19:49
+error[E0284]: type annotations needed: cannot satisfy `the constant `name_len::<T>()` can be evaluated`
+ --> $DIR/issue-88119.rs:21:5
|
-LL | impl<T: ?Sized + ConstName> const ConstName for &T
- | ^^ cannot normalize `<&T as ConstName>::{constant#0}`
+LL | [(); name_len::<T>()]:,
+ | ^^^^^^^^^^^^^^^^^^^^^ cannot satisfy `the constant `name_len::<T>()` can be evaluated`
|
-note: required for `&T` to implement `ConstName`
- --> $DIR/issue-88119.rs:19:35
+note: required by a bound in `<&T as ConstName>`
+ --> $DIR/issue-88119.rs:21:10
|
-LL | impl<T: ?Sized + ConstName> const ConstName for &T
- | ^^^^^^^^^ ^^
-LL | where
LL | [(); name_len::<T>()]:,
- | --------------------- unsatisfied trait bound introduced here
+ | ^^^^^^^^^^^^^^^ required by this bound in `<&T as ConstName>`
-error[E0284]: type annotations needed: cannot normalize `<&mut T as ConstName>::{constant#0}`
- --> $DIR/issue-88119.rs:26:49
+error[E0284]: type annotations needed: cannot satisfy `the constant `name_len::<T>()` can be evaluated`
+ --> $DIR/issue-88119.rs:28:5
|
-LL | impl<T: ?Sized + ConstName> const ConstName for &mut T
- | ^^^^^^ cannot normalize `<&mut T as ConstName>::{constant#0}`
+LL | [(); name_len::<T>()]:,
+ | ^^^^^^^^^^^^^^^^^^^^^ cannot satisfy `the constant `name_len::<T>()` can be evaluated`
|
-note: required for `&mut T` to implement `ConstName`
- --> $DIR/issue-88119.rs:26:35
+note: required by a bound in `<&mut T as ConstName>`
+ --> $DIR/issue-88119.rs:28:10
|
-LL | impl<T: ?Sized + ConstName> const ConstName for &mut T
- | ^^^^^^^^^ ^^^^^^
-LL | where
LL | [(); name_len::<T>()]:,
- | --------------------- unsatisfied trait bound introduced here
+ | ^^^^^^^^^^^^^^^ required by this bound in `<&mut T as ConstName>`
error: aborting due to 2 previous errors
diff --git a/tests/ui/const-generics/repeat_expr_hack_gives_right_generics.rs b/tests/ui/const-generics/repeat_expr_hack_gives_right_generics.rs
index def4611f94b72..e7ae2ea1d5a6a 100644
--- a/tests/ui/const-generics/repeat_expr_hack_gives_right_generics.rs
+++ b/tests/ui/const-generics/repeat_expr_hack_gives_right_generics.rs
@@ -19,8 +19,6 @@ fn bar<const N: usize>() {}
fn foo<const N: usize>() {
bar::<{ [1; N] }>();
//~^ ERROR: generic parameters may not be used in const operations
- bar::<{ [1; { N + 1 }] }>();
- //~^ ERROR: generic parameters may not be used in const operations
}
fn main() {}
diff --git a/tests/ui/const-generics/repeat_expr_hack_gives_right_generics.stderr b/tests/ui/const-generics/repeat_expr_hack_gives_right_generics.stderr
index ead6c621d60be..72a6e6977f583 100644
--- a/tests/ui/const-generics/repeat_expr_hack_gives_right_generics.stderr
+++ b/tests/ui/const-generics/repeat_expr_hack_gives_right_generics.stderr
@@ -7,14 +7,5 @@ LL | bar::<{ [1; N] }>();
= help: const parameters may only be used as standalone arguments, i.e. `N`
= help: add `#![feature(generic_const_exprs)]` to allow generic const expressions
-error: generic parameters may not be used in const operations
- --> $DIR/repeat_expr_hack_gives_right_generics.rs:22:19
- |
-LL | bar::<{ [1; { N + 1 }] }>();
- | ^ cannot perform const operation using `N`
- |
- = help: const parameters may only be used as standalone arguments, i.e. `N`
- = help: add `#![feature(generic_const_exprs)]` to allow generic const expressions
-
-error: aborting due to 2 previous errors
+error: aborting due to 1 previous error
diff --git a/tests/ui/const-generics/transmute-fail.rs b/tests/ui/const-generics/transmute-fail.rs
index 59b77c678e8ce..90afd23253465 100644
--- a/tests/ui/const-generics/transmute-fail.rs
+++ b/tests/ui/const-generics/transmute-fail.rs
@@ -10,10 +10,11 @@ fn foo<const W: usize, const H: usize>(v: [[u32;H+1]; W]) -> [[u32; W+1]; H] {
}
fn bar<const W: bool, const H: usize>(v: [[u32; H]; W]) -> [[u32; W]; H] {
- //~^ ERROR the constant `W` is not of type `usize`
+ //~^ ERROR mismatched types
+ //~| ERROR mismatched types
unsafe {
std::mem::transmute(v)
- //~^ ERROR the constant `W` is not of type `usize`
+ //~^ ERROR cannot transmute between types
}
}
diff --git a/tests/ui/const-generics/transmute-fail.stderr b/tests/ui/const-generics/transmute-fail.stderr
index b40fb23c33158..b76ec10bd3f21 100644
--- a/tests/ui/const-generics/transmute-fail.stderr
+++ b/tests/ui/const-generics/transmute-fail.stderr
@@ -1,9 +1,3 @@
-error: the constant `W` is not of type `usize`
- --> $DIR/transmute-fail.rs:12:42
- |
-LL | fn bar<const W: bool, const H: usize>(v: [[u32; H]; W]) -> [[u32; W]; H] {
- | ^^^^^^^^^^^^^ expected `usize`, found `bool`
-
error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
--> $DIR/transmute-fail.rs:7:5
|
@@ -13,14 +7,17 @@ LL | std::mem::transmute(v)
= note: source type: `[[u32; H+1]; W]` (size can vary because of [u32; H+1])
= note: target type: `[[u32; W+1]; H]` (size can vary because of [u32; W+1])
-error: the constant `W` is not of type `usize`
- --> $DIR/transmute-fail.rs:15:5
+error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
+ --> $DIR/transmute-fail.rs:16:5
|
LL | std::mem::transmute(v)
- | ^^^^^^^^^^^^^^^^^^^ expected `usize`, found `bool`
+ | ^^^^^^^^^^^^^^^^^^^
+ |
+ = note: source type: `[[u32; H]; W]` (size can vary because of [u32; H])
+ = note: target type: `[[u32; W]; H]` (size can vary because of [u32; W])
error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
- --> $DIR/transmute-fail.rs:22:5
+ --> $DIR/transmute-fail.rs:23:5
|
LL | std::mem::transmute(v)
| ^^^^^^^^^^^^^^^^^^^
@@ -29,7 +26,7 @@ LL | std::mem::transmute(v)
= note: target type: `[u32; W * H * H]` (this type does not have a fixed size)
error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
- --> $DIR/transmute-fail.rs:29:5
+ --> $DIR/transmute-fail.rs:30:5
|
LL | std::mem::transmute(v)
| ^^^^^^^^^^^^^^^^^^^
@@ -38,7 +35,7 @@ LL | std::mem::transmute(v)
= note: target type: `[[[u32; 9999999]; 777777777]; 8888888]` (values of the type `[[u32; 9999999]; 777777777]` are too big for the current architecture)
error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
- --> $DIR/transmute-fail.rs:36:5
+ --> $DIR/transmute-fail.rs:37:5
|
LL | std::mem::transmute(v)
| ^^^^^^^^^^^^^^^^^^^
@@ -47,7 +44,7 @@ LL | std::mem::transmute(v)
= note: target type: `[[u32; W]; H]` (size can vary because of [u32; W])
error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
- --> $DIR/transmute-fail.rs:49:5
+ --> $DIR/transmute-fail.rs:50:5
|
LL | std::mem::transmute(v)
| ^^^^^^^^^^^^^^^^^^^
@@ -56,7 +53,7 @@ LL | std::mem::transmute(v)
= note: target type: `[u32; W * H]` (this type does not have a fixed size)
error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
- --> $DIR/transmute-fail.rs:56:5
+ --> $DIR/transmute-fail.rs:57:5
|
LL | std::mem::transmute(v)
| ^^^^^^^^^^^^^^^^^^^
@@ -65,7 +62,7 @@ LL | std::mem::transmute(v)
= note: target type: `[[u32; W]; H]` (size can vary because of [u32; W])
error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
- --> $DIR/transmute-fail.rs:65:5
+ --> $DIR/transmute-fail.rs:66:5
|
LL | std::mem::transmute(v)
| ^^^^^^^^^^^^^^^^^^^
@@ -74,7 +71,7 @@ LL | std::mem::transmute(v)
= note: target type: `[u32; D * W * H]` (this type does not have a fixed size)
error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
- --> $DIR/transmute-fail.rs:74:5
+ --> $DIR/transmute-fail.rs:75:5
|
LL | std::mem::transmute(v)
| ^^^^^^^^^^^^^^^^^^^
@@ -83,7 +80,7 @@ LL | std::mem::transmute(v)
= note: target type: `[[u32; D * W]; H]` (size can vary because of [u32; D * W])
error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
- --> $DIR/transmute-fail.rs:81:5
+ --> $DIR/transmute-fail.rs:82:5
|
LL | std::mem::transmute(v)
| ^^^^^^^^^^^^^^^^^^^
@@ -92,7 +89,7 @@ LL | std::mem::transmute(v)
= note: target type: `[u8; L * 2]` (this type does not have a fixed size)
error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
- --> $DIR/transmute-fail.rs:88:5
+ --> $DIR/transmute-fail.rs:89:5
|
LL | std::mem::transmute(v)
| ^^^^^^^^^^^^^^^^^^^
@@ -101,7 +98,7 @@ LL | std::mem::transmute(v)
= note: target type: `[u16; L]` (this type does not have a fixed size)
error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
- --> $DIR/transmute-fail.rs:95:5
+ --> $DIR/transmute-fail.rs:96:5
|
LL | std::mem::transmute(v)
| ^^^^^^^^^^^^^^^^^^^
@@ -110,7 +107,7 @@ LL | std::mem::transmute(v)
= note: target type: `[[u8; 1]; L]` (this type does not have a fixed size)
error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
- --> $DIR/transmute-fail.rs:104:5
+ --> $DIR/transmute-fail.rs:105:5
|
LL | std::mem::transmute(v)
| ^^^^^^^^^^^^^^^^^^^
@@ -118,6 +115,19 @@ LL | std::mem::transmute(v)
= note: source type: `[[u32; 2 * H]; W + W]` (size can vary because of [u32; 2 * H])
= note: target type: `[[u32; W + W]; 2 * H]` (size can vary because of [u32; W + W])
-error: aborting due to 14 previous errors
+error[E0308]: mismatched types
+ --> $DIR/transmute-fail.rs:12:53
+ |
+LL | fn bar<const W: bool, const H: usize>(v: [[u32; H]; W]) -> [[u32; W]; H] {
+ | ^ expected `usize`, found `bool`
+
+error[E0308]: mismatched types
+ --> $DIR/transmute-fail.rs:12:67
+ |
+LL | fn bar<const W: bool, const H: usize>(v: [[u32; H]; W]) -> [[u32; W]; H] {
+ | ^ expected `usize`, found `bool`
+
+error: aborting due to 15 previous errors
-For more information about this error, try `rustc --explain E0512`.
+Some errors have detailed explanations: E0308, E0512.
+For more information about an error, try `rustc --explain E0308`.
diff --git a/tests/ui/const-generics/type_mismatch.rs b/tests/ui/const-generics/type_mismatch.rs
index 8187c785cd1c7..daa13277be0a0 100644
--- a/tests/ui/const-generics/type_mismatch.rs
+++ b/tests/ui/const-generics/type_mismatch.rs
@@ -1,10 +1,10 @@
fn foo<const N: usize>() -> [u8; N] {
- bar::<N>()
+ bar::<N>() //~ ERROR mismatched types
//~^ ERROR the constant `N` is not of type `u8`
}
fn bar<const N: u8>() -> [u8; N] {}
-//~^ ERROR the constant `N` is not of type `usize`
+//~^ ERROR mismatched types
//~| ERROR mismatched types
fn main() {}
diff --git a/tests/ui/const-generics/type_mismatch.stderr b/tests/ui/const-generics/type_mismatch.stderr
index d1bb5c1242f02..026999827c0e0 100644
--- a/tests/ui/const-generics/type_mismatch.stderr
+++ b/tests/ui/const-generics/type_mismatch.stderr
@@ -1,9 +1,3 @@
-error: the constant `N` is not of type `usize`
- --> $DIR/type_mismatch.rs:6:26
- |
-LL | fn bar<const N: u8>() -> [u8; N] {}
- | ^^^^^^^ expected `usize`, found `u8`
-
error: the constant `N` is not of type `u8`
--> $DIR/type_mismatch.rs:2:11
|
@@ -24,6 +18,18 @@ LL | fn bar<const N: u8>() -> [u8; N] {}
| |
| implicitly returns `()` as its body has no tail or `return` expression
-error: aborting due to 3 previous errors
+error[E0308]: mismatched types
+ --> $DIR/type_mismatch.rs:2:11
+ |
+LL | bar::<N>()
+ | ^ expected `u8`, found `usize`
+
+error[E0308]: mismatched types
+ --> $DIR/type_mismatch.rs:6:31
+ |
+LL | fn bar<const N: u8>() -> [u8; N] {}
+ | ^ expected `usize`, found `u8`
+
+error: aborting due to 4 previous errors
For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/consts/issue-36163.stderr b/tests/ui/consts/issue-36163.stderr
index 52d3e003f0ac9..8a7a0981f4154 100644
--- a/tests/ui/consts/issue-36163.stderr
+++ b/tests/ui/consts/issue-36163.stderr
@@ -1,10 +1,10 @@
-error[E0391]: cycle detected when simplifying constant for the type system `Foo::{constant#0}`
+error[E0391]: cycle detected when simplifying constant for the type system `Foo::B::{constant#0}`
--> $DIR/issue-36163.rs:4:9
|
LL | B = A,
| ^
|
-note: ...which requires const-evaluating + checking `Foo::{constant#0}`...
+note: ...which requires const-evaluating + checking `Foo::B::{constant#0}`...
--> $DIR/issue-36163.rs:4:9
|
LL | B = A,
@@ -19,7 +19,7 @@ note: ...which requires const-evaluating + checking `A`...
|
LL | const A: isize = Foo::B as isize;
| ^^^^^^^^^^^^^^^
- = note: ...which again requires simplifying constant for the type system `Foo::{constant#0}`, completing the cycle
+ = note: ...which again requires simplifying constant for the type system `Foo::B::{constant#0}`, completing the cycle
note: cycle used when checking that `Foo` is well-formed
--> $DIR/issue-36163.rs:3:1
|
diff --git a/tests/ui/deriving/auxiliary/another-proc-macro.rs b/tests/ui/deriving/auxiliary/another-proc-macro.rs
new file mode 100644
index 0000000000000..a05175c9de926
--- /dev/null
+++ b/tests/ui/deriving/auxiliary/another-proc-macro.rs
@@ -0,0 +1,45 @@
+//@ force-host
+//@ no-prefer-dynamic
+
+#![crate_type = "proc-macro"]
+#![feature(proc_macro_quote)]
+
+extern crate proc_macro;
+
+use proc_macro::{quote, TokenStream};
+
+#[proc_macro_derive(AnotherMacro, attributes(pointee))]
+pub fn derive(_input: TokenStream) -> TokenStream {
+ quote! {
+ const _: () = {
+ const ANOTHER_MACRO_DERIVED: () = ();
+ };
+ }
+ .into()
+}
+
+#[proc_macro_attribute]
+pub fn pointee(
+ _attr: proc_macro::TokenStream,
+ _item: proc_macro::TokenStream,
+) -> proc_macro::TokenStream {
+ quote! {
+ const _: () = {
+ const POINTEE_MACRO_ATTR_DERIVED: () = ();
+ };
+ }
+ .into()
+}
+
+#[proc_macro_attribute]
+pub fn default(
+ _attr: proc_macro::TokenStream,
+ _item: proc_macro::TokenStream,
+) -> proc_macro::TokenStream {
+ quote! {
+ const _: () = {
+ const DEFAULT_MACRO_ATTR_DERIVED: () = ();
+ };
+ }
+ .into()
+}
diff --git a/tests/ui/deriving/built-in-proc-macro-scope.rs b/tests/ui/deriving/built-in-proc-macro-scope.rs
new file mode 100644
index 0000000000000..41c95f63b135e
--- /dev/null
+++ b/tests/ui/deriving/built-in-proc-macro-scope.rs
@@ -0,0 +1,25 @@
+//@ check-pass
+//@ aux-build: another-proc-macro.rs
+//@ compile-flags: -Zunpretty=expanded
+
+#![feature(derive_smart_pointer)]
+
+#[macro_use]
+extern crate another_proc_macro;
+
+use another_proc_macro::{pointee, AnotherMacro};
+
+#[derive(core::marker::SmartPointer)]
+#[repr(transparent)]
+pub struct Ptr<'a, #[pointee] T: ?Sized> {
+ data: &'a mut T,
+}
+
+#[pointee]
+fn f() {}
+
+#[derive(AnotherMacro)]
+#[pointee]
+struct MyStruct;
+
+fn main() {}
diff --git a/tests/ui/deriving/built-in-proc-macro-scope.stdout b/tests/ui/deriving/built-in-proc-macro-scope.stdout
new file mode 100644
index 0000000000000..2512cb97fdba7
--- /dev/null
+++ b/tests/ui/deriving/built-in-proc-macro-scope.stdout
@@ -0,0 +1,43 @@
+#![feature(prelude_import)]
+#![no_std]
+//@ check-pass
+//@ aux-build: another-proc-macro.rs
+//@ compile-flags: -Zunpretty=expanded
+
+#![feature(derive_smart_pointer)]
+#[prelude_import]
+use ::std::prelude::rust_2015::*;
+#[macro_use]
+extern crate std;
+
+#[macro_use]
+extern crate another_proc_macro;
+
+use another_proc_macro::{pointee, AnotherMacro};
+
+#[repr(transparent)]
+pub struct Ptr<'a, #[pointee] T: ?Sized> {
+ data: &'a mut T,
+}
+#[automatically_derived]
+impl<'a, T: ?Sized + ::core::marker::Unsize<__S>, __S: ?::core::marker::Sized>
+ ::core::ops::DispatchFromDyn<Ptr<'a, __S>> for Ptr<'a, T> {
+}
+#[automatically_derived]
+impl<'a, T: ?Sized + ::core::marker::Unsize<__S>, __S: ?::core::marker::Sized>
+ ::core::ops::CoerceUnsized<Ptr<'a, __S>> for Ptr<'a, T> {
+}
+
+
+
+const _: () =
+ {
+ const POINTEE_MACRO_ATTR_DERIVED: () = ();
+ };
+#[pointee]
+struct MyStruct;
+const _: () =
+ {
+ const ANOTHER_MACRO_DERIVED: () = ();
+ };
+fn main() {}
diff --git a/tests/ui/deriving/proc-macro-attribute-mixing.rs b/tests/ui/deriving/proc-macro-attribute-mixing.rs
new file mode 100644
index 0000000000000..489665ebeb520
--- /dev/null
+++ b/tests/ui/deriving/proc-macro-attribute-mixing.rs
@@ -0,0 +1,20 @@
+// This test certify that we can mix attribute macros from Rust and external proc-macros.
+// For instance, `#[derive(Default)]` uses `#[default]` and `#[derive(SmartPointer)]` uses
+// `#[pointee]`.
+// The scoping rule should allow the use of the said two attributes when external proc-macros
+// are in scope.
+
+//@ check-pass
+//@ aux-build: another-proc-macro.rs
+//@ compile-flags: -Zunpretty=expanded
+
+#![feature(derive_smart_pointer)]
+
+#[macro_use]
+extern crate another_proc_macro;
+
+#[pointee]
+fn f() {}
+
+#[default]
+fn g() {}
diff --git a/tests/ui/deriving/proc-macro-attribute-mixing.stdout b/tests/ui/deriving/proc-macro-attribute-mixing.stdout
new file mode 100644
index 0000000000000..f314f6efbe2b9
--- /dev/null
+++ b/tests/ui/deriving/proc-macro-attribute-mixing.stdout
@@ -0,0 +1,30 @@
+#![feature(prelude_import)]
+#![no_std]
+// This test certify that we can mix attribute macros from Rust and external proc-macros.
+// For instance, `#[derive(Default)]` uses `#[default]` and `#[derive(SmartPointer)]` uses
+// `#[pointee]`.
+// The scoping rule should allow the use of the said two attributes when external proc-macros
+// are in scope.
+
+//@ check-pass
+//@ aux-build: another-proc-macro.rs
+//@ compile-flags: -Zunpretty=expanded
+
+#![feature(derive_smart_pointer)]
+#[prelude_import]
+use ::std::prelude::rust_2015::*;
+#[macro_use]
+extern crate std;
+
+#[macro_use]
+extern crate another_proc_macro;
+
+
+const _: () =
+ {
+ const POINTEE_MACRO_ATTR_DERIVED: () = ();
+ };
+const _: () =
+ {
+ const DEFAULT_MACRO_ATTR_DERIVED: () = ();
+ };
diff --git a/tests/ui/feature-gates/feature-gate-derive-smart-pointer.rs b/tests/ui/feature-gates/feature-gate-derive-smart-pointer.rs
index 3257a9ca624ba..7b4764ee768ab 100644
--- a/tests/ui/feature-gates/feature-gate-derive-smart-pointer.rs
+++ b/tests/ui/feature-gates/feature-gate-derive-smart-pointer.rs
@@ -3,7 +3,6 @@ use std::marker::SmartPointer; //~ ERROR use of unstable library feature 'derive
#[derive(SmartPointer)] //~ ERROR use of unstable library feature 'derive_smart_pointer'
#[repr(transparent)]
struct MyPointer<'a, #[pointee] T: ?Sized> {
- //~^ ERROR the `#[pointee]` attribute is an experimental feature
ptr: &'a T,
}
diff --git a/tests/ui/feature-gates/feature-gate-derive-smart-pointer.stderr b/tests/ui/feature-gates/feature-gate-derive-smart-pointer.stderr
index 19501939dc5be..ea4d1271b7c87 100644
--- a/tests/ui/feature-gates/feature-gate-derive-smart-pointer.stderr
+++ b/tests/ui/feature-gates/feature-gate-derive-smart-pointer.stderr
@@ -8,16 +8,6 @@ LL | #[derive(SmartPointer)]
= help: add `#![feature(derive_smart_pointer)]` to the crate attributes to enable
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
-error[E0658]: the `#[pointee]` attribute is an experimental feature
- --> $DIR/feature-gate-derive-smart-pointer.rs:5:22
- |
-LL | struct MyPointer<'a, #[pointee] T: ?Sized> {
- | ^^^^^^^^^^
- |
- = note: see issue #123430 <https://github.com/rust-lang/rust/issues/123430> for more information
- = help: add `#![feature(derive_smart_pointer)]` to the crate attributes to enable
- = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
-
error[E0658]: use of unstable library feature 'derive_smart_pointer'
--> $DIR/feature-gate-derive-smart-pointer.rs:1:5
|
@@ -28,6 +18,6 @@ LL | use std::marker::SmartPointer;
= help: add `#![feature(derive_smart_pointer)]` to the crate attributes to enable
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
-error: aborting due to 3 previous errors
+error: aborting due to 2 previous errors
For more information about this error, try `rustc --explain E0658`.
diff --git a/tests/ui/lifetimes/issue-95023.rs b/tests/ui/lifetimes/issue-95023.rs
index bcacd01474fbb..7a67297c7632a 100644
--- a/tests/ui/lifetimes/issue-95023.rs
+++ b/tests/ui/lifetimes/issue-95023.rs
@@ -9,5 +9,6 @@ impl Fn(&isize) for Error {
//~^ ERROR associated function in `impl` without body
//~^^ ERROR method `foo` is not a member of trait `Fn` [E0407]
//~^^^ ERROR associated type `B` not found for `Self` [E0220]
+ //~| ERROR associated type `B` not found for `Self` [E0220]
}
fn main() {}
diff --git a/tests/ui/lifetimes/issue-95023.stderr b/tests/ui/lifetimes/issue-95023.stderr
index cbc0eeebee113..310dee5140603 100644
--- a/tests/ui/lifetimes/issue-95023.stderr
+++ b/tests/ui/lifetimes/issue-95023.stderr
@@ -56,7 +56,15 @@ error[E0220]: associated type `B` not found for `Self`
LL | fn foo<const N: usize>(&self) -> Self::B<{ N }>;
| ^ help: `Self` has the following associated type: `Output`
-error: aborting due to 7 previous errors
+error[E0220]: associated type `B` not found for `Self`
+ --> $DIR/issue-95023.rs:8:44
+ |
+LL | fn foo<const N: usize>(&self) -> Self::B<{ N }>;
+ | ^ help: `Self` has the following associated type: `Output`
+ |
+ = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
+
+error: aborting due to 8 previous errors
Some errors have detailed explanations: E0046, E0183, E0220, E0229, E0277, E0407.
For more information about an error, try `rustc --explain E0046`.
diff --git a/tests/ui/proc-macro/auxiliary/parse-invis-delim-issue-128895.rs b/tests/ui/proc-macro/auxiliary/parse-invis-delim-issue-128895.rs
new file mode 100644
index 0000000000000..07e135ee8ebef
--- /dev/null
+++ b/tests/ui/proc-macro/auxiliary/parse-invis-delim-issue-128895.rs
@@ -0,0 +1,44 @@
+//@ force-host
+//@ no-prefer-dynamic
+
+#![crate_type = "proc-macro"]
+
+extern crate proc_macro;
+
+use proc_macro::*;
+
+// This proc macro ignores its input and returns this token stream
+//
+// impl <«A1»: Comparable> Comparable for («A1»,) {}
+//
+// where `«`/`»` are invisible delimiters. This was being misparsed in bug
+// #128895.
+#[proc_macro]
+pub fn main(_input: TokenStream) -> TokenStream {
+ let a1 = TokenTree::Group(
+ Group::new(
+ Delimiter::None,
+ std::iter::once(TokenTree::Ident(Ident::new("A1", Span::call_site()))).collect(),
+ )
+ );
+ vec![
+ TokenTree::Ident(Ident::new("impl", Span::call_site())),
+ TokenTree::Punct(Punct::new('<', Spacing::Alone)),
+ a1.clone(),
+ TokenTree::Punct(Punct::new(':', Spacing::Alone)),
+ TokenTree::Ident(Ident::new("Comparable", Span::call_site())),
+ TokenTree::Punct(Punct::new('>', Spacing::Alone)),
+ TokenTree::Ident(Ident::new("Comparable", Span::call_site())),
+ TokenTree::Ident(Ident::new("for", Span::call_site())),
+ TokenTree::Group(
+ Group::new(
+ Delimiter::Parenthesis,
+ vec![
+ a1.clone(),
+ TokenTree::Punct(Punct::new(',', Spacing::Alone)),
+ ].into_iter().collect::<TokenStream>(),
+ )
+ ),
+ TokenTree::Group(Group::new(Delimiter::Brace, TokenStream::new())),
+ ].into_iter().collect::<TokenStream>()
+}
diff --git a/tests/ui/proc-macro/parse-invis-delim-issue-128895.rs b/tests/ui/proc-macro/parse-invis-delim-issue-128895.rs
new file mode 100644
index 0000000000000..3d5af5fee217d
--- /dev/null
+++ b/tests/ui/proc-macro/parse-invis-delim-issue-128895.rs
@@ -0,0 +1,14 @@
+//@ aux-build:parse-invis-delim-issue-128895.rs
+//@ check-pass
+
+#![no_std] // Don't load unnecessary hygiene information from std
+extern crate std;
+
+#[macro_use]
+extern crate parse_invis_delim_issue_128895;
+
+trait Comparable {}
+
+parse_invis_delim_issue_128895::main!();
+
+fn main() {}
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bounds.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bounds.stderr
index 7db6a77c77bf6..4d543f6a1559a 100644
--- a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bounds.stderr
+++ b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bounds.stderr
@@ -4,11 +4,20 @@ error[E0284]: type annotations needed: cannot normalize `process<T>::{constant#0
LL | fn process<T: const Trait>(input: [(); T::make(2)]) -> [(); T::make(2)] {
| ^^^^^^^^^^^^^^^^ cannot normalize `process<T>::{constant#0}`
-error[E0284]: type annotations needed: cannot normalize `Struct<T, P>::field::{constant#0}`
- --> $DIR/const-trait-bounds.rs:20:12
+error[E0284]: type annotations needed: cannot satisfy `the constant `T::make(P)` can be evaluated`
+ --> $DIR/const-trait-bounds.rs:18:5
|
-LL | field: [u32; T::make(P)],
- | ^^^^^^^^^^^^^^^^^ cannot normalize `Struct<T, P>::field::{constant#0}`
+LL | [u32; T::make(P)]:,
+ | ^^^^^^^^^^^^^^^^^ cannot satisfy `the constant `T::make(P)` can be evaluated`
+ |
+note: required by a bound in `Struct`
+ --> $DIR/const-trait-bounds.rs:18:11
+ |
+LL | struct Struct<T: const Trait, const P: usize>
+ | ------ required by a bound in this struct
+LL | where
+LL | [u32; T::make(P)]:,
+ | ^^^^^^^^^^ required by this bound in `Struct`
error[E0284]: type annotations needed: cannot normalize `process<T>::{constant#1}`
--> $DIR/const-trait-bounds.rs:13:5
diff --git a/tests/ui/specialization/default-proj-ty-as-type-of-const-issue-125757.rs b/tests/ui/specialization/default-proj-ty-as-type-of-const-issue-125757.rs
index fb962ad24bf93..59a015da84ebd 100644
--- a/tests/ui/specialization/default-proj-ty-as-type-of-const-issue-125757.rs
+++ b/tests/ui/specialization/default-proj-ty-as-type-of-const-issue-125757.rs
@@ -14,5 +14,6 @@ struct Wrapper<const C: <i32 as Trait>::Type> {}
impl<const C: usize> Wrapper<C> {}
//~^ ERROR the constant `C` is not of type `<i32 as Trait>::Type`
+//~^^ ERROR mismatched types
fn main() {}
diff --git a/tests/ui/specialization/default-proj-ty-as-type-of-const-issue-125757.stderr b/tests/ui/specialization/default-proj-ty-as-type-of-const-issue-125757.stderr
index 7094ee8c67ca0..71d4277275fee 100644
--- a/tests/ui/specialization/default-proj-ty-as-type-of-const-issue-125757.stderr
+++ b/tests/ui/specialization/default-proj-ty-as-type-of-const-issue-125757.stderr
@@ -20,5 +20,17 @@ note: required by a const generic parameter in `Wrapper`
LL | struct Wrapper<const C: <i32 as Trait>::Type> {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this const generic parameter in `Wrapper`
-error: aborting due to 2 previous errors
+error[E0308]: mismatched types
+ --> $DIR/default-proj-ty-as-type-of-const-issue-125757.rs:15:30
+ |
+LL | impl<const C: usize> Wrapper<C> {}
+ | ^ expected associated type, found `usize`
+ |
+ = note: expected associated type `<i32 as Trait>::Type`
+ found type `usize`
+ = help: consider constraining the associated type `<i32 as Trait>::Type` to `usize`
+ = note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
+
+error: aborting due to 3 previous errors
+For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/specialization/min_specialization/bad-const-wf-doesnt-specialize.rs b/tests/ui/specialization/min_specialization/bad-const-wf-doesnt-specialize.rs
index a0ee771441772..f89a463bc5805 100644
--- a/tests/ui/specialization/min_specialization/bad-const-wf-doesnt-specialize.rs
+++ b/tests/ui/specialization/min_specialization/bad-const-wf-doesnt-specialize.rs
@@ -6,6 +6,7 @@
struct S<const L: usize>;
impl<const N: i32> Copy for S<N> {}
+//~^ ERROR: mismatched types
impl<const M: usize> Copy for S<M> {}
//~^ ERROR: conflicting implementations of trait `Copy` for type `S<_>`
diff --git a/tests/ui/specialization/min_specialization/bad-const-wf-doesnt-specialize.stderr b/tests/ui/specialization/min_specialization/bad-const-wf-doesnt-specialize.stderr
index 2953bc95917c9..1dac58e1f694e 100644
--- a/tests/ui/specialization/min_specialization/bad-const-wf-doesnt-specialize.stderr
+++ b/tests/ui/specialization/min_specialization/bad-const-wf-doesnt-specialize.stderr
@@ -1,11 +1,19 @@
error[E0119]: conflicting implementations of trait `Copy` for type `S<_>`
- --> $DIR/bad-const-wf-doesnt-specialize.rs:9:1
+ --> $DIR/bad-const-wf-doesnt-specialize.rs:10:1
|
LL | impl<const N: i32> Copy for S<N> {}
| -------------------------------- first implementation here
+LL |
LL | impl<const M: usize> Copy for S<M> {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `S<_>`
-error: aborting due to 1 previous error
+error[E0308]: mismatched types
+ --> $DIR/bad-const-wf-doesnt-specialize.rs:8:31
+ |
+LL | impl<const N: i32> Copy for S<N> {}
+ | ^ expected `usize`, found `i32`
+
+error: aborting due to 2 previous errors
-For more information about this error, try `rustc --explain E0119`.
+Some errors have detailed explanations: E0119, E0308.
+For more information about an error, try `rustc --explain E0119`.
diff --git a/tests/ui/stats/hir-stats.stderr b/tests/ui/stats/hir-stats.stderr
index b27f769ba34f4..a7a612a8a9ea7 100644
--- a/tests/ui/stats/hir-stats.stderr
+++ b/tests/ui/stats/hir-stats.stderr
@@ -123,15 +123,15 @@ hir-stats Lifetime 24 ( 0.3%) 1 24
hir-stats Mod 32 ( 0.4%) 1 32
hir-stats ExprField 40 ( 0.4%) 1 40
hir-stats TraitItemRef 56 ( 0.6%) 2 28
-hir-stats GenericArg 64 ( 0.7%) 4 16
-hir-stats - Type 16 ( 0.2%) 1
-hir-stats - Lifetime 48 ( 0.5%) 3
hir-stats Local 64 ( 0.7%) 1 64
hir-stats Param 64 ( 0.7%) 2 32
hir-stats Body 72 ( 0.8%) 3 24
hir-stats InlineAsm 72 ( 0.8%) 1 72
hir-stats ImplItemRef 72 ( 0.8%) 2 36
hir-stats Arm 80 ( 0.9%) 2 40
+hir-stats GenericArg 96 ( 1.1%) 4 24
+hir-stats - Type 24 ( 0.3%) 1
+hir-stats - Lifetime 72 ( 0.8%) 3
hir-stats FieldDef 96 ( 1.1%) 2 48
hir-stats Stmt 96 ( 1.1%) 3 32
hir-stats - Let 32 ( 0.4%) 1
@@ -155,8 +155,8 @@ hir-stats Generics 560 ( 6.2%) 10 56
hir-stats Ty 720 ( 8.0%) 15 48
hir-stats - Ptr 48 ( 0.5%) 1
hir-stats - Ref 48 ( 0.5%) 1
-hir-stats - Path 624 ( 7.0%) 13
-hir-stats Expr 768 ( 8.6%) 12 64
+hir-stats - Path 624 ( 6.9%) 13
+hir-stats Expr 768 ( 8.5%) 12 64
hir-stats - Path 64 ( 0.7%) 1
hir-stats - Struct 64 ( 0.7%) 1
hir-stats - Match 64 ( 0.7%) 1
@@ -174,5 +174,5 @@ hir-stats - Use 352 ( 3.9%) 4
hir-stats Path 1_240 (13.8%) 31 40
hir-stats PathSegment 1_920 (21.4%) 40 48
hir-stats ----------------------------------------------------------------
-hir-stats Total 8_960
+hir-stats Total 8_992
hir-stats
diff --git a/tests/ui/traits/non_lifetime_binders/capture-late-ct-in-anon.rs b/tests/ui/traits/non_lifetime_binders/capture-late-ct-in-anon.rs
new file mode 100644
index 0000000000000..bbae67f0bad41
--- /dev/null
+++ b/tests/ui/traits/non_lifetime_binders/capture-late-ct-in-anon.rs
@@ -0,0 +1,11 @@
+#![feature(non_lifetime_binders)]
+//~^ WARN the feature `non_lifetime_binders` is incomplete
+
+fn b()
+where
+ for<const C: usize> [(); C]: Copy,
+ //~^ ERROR cannot capture late-bound const parameter in constant
+{
+}
+
+fn main() {}
diff --git a/tests/ui/traits/non_lifetime_binders/capture-late-ct-in-anon.stderr b/tests/ui/traits/non_lifetime_binders/capture-late-ct-in-anon.stderr
new file mode 100644
index 0000000000000..4e0441c1c7d02
--- /dev/null
+++ b/tests/ui/traits/non_lifetime_binders/capture-late-ct-in-anon.stderr
@@ -0,0 +1,19 @@
+warning: the feature `non_lifetime_binders` is incomplete and may not be safe to use and/or cause compiler crashes
+ --> $DIR/capture-late-ct-in-anon.rs:1:12
+ |
+LL | #![feature(non_lifetime_binders)]
+ | ^^^^^^^^^^^^^^^^^^^^
+ |
+ = note: see issue #108185 <https://github.com/rust-lang/rust/issues/108185> for more information
+ = note: `#[warn(incomplete_features)]` on by default
+
+error: cannot capture late-bound const parameter in constant
+ --> $DIR/capture-late-ct-in-anon.rs:6:30
+ |
+LL | for<const C: usize> [(); C]: Copy,
+ | -------------- ^
+ | |
+ | parameter defined here
+
+error: aborting due to 1 previous error; 1 warning emitted
+
diff --git a/tests/ui/transmutability/issue-101739-1.rs b/tests/ui/transmutability/issue-101739-1.rs
index 20bd7917e5322..0695d7d409fe0 100644
--- a/tests/ui/transmutability/issue-101739-1.rs
+++ b/tests/ui/transmutability/issue-101739-1.rs
@@ -7,6 +7,7 @@ mod assert {
where
Dst: BikeshedIntrinsicFrom<Src, ASSUME_ALIGNMENT>, //~ ERROR cannot find type `Dst` in this scope
//~^ the constant `ASSUME_ALIGNMENT` is not of type `Assume`
+ //~| ERROR: mismatched types
{
}
}
diff --git a/tests/ui/transmutability/issue-101739-1.stderr b/tests/ui/transmutability/issue-101739-1.stderr
index ba18a980f4d0a..6f79bf7b42468 100644
--- a/tests/ui/transmutability/issue-101739-1.stderr
+++ b/tests/ui/transmutability/issue-101739-1.stderr
@@ -13,6 +13,13 @@ LL | Dst: BikeshedIntrinsicFrom<Src, ASSUME_ALIGNMENT>,
note: required by a const generic parameter in `BikeshedIntrinsicFrom`
--> $SRC_DIR/core/src/mem/transmutability.rs:LL:COL
-error: aborting due to 2 previous errors
+error[E0308]: mismatched types
+ --> $DIR/issue-101739-1.rs:8:41
+ |
+LL | Dst: BikeshedIntrinsicFrom<Src, ASSUME_ALIGNMENT>,
+ | ^^^^^^^^^^^^^^^^ expected `Assume`, found `bool`
+
+error: aborting due to 3 previous errors
-For more information about this error, try `rustc --explain E0412`.
+Some errors have detailed explanations: E0308, E0412.
+For more information about an error, try `rustc --explain E0308`.
diff --git a/tests/ui/transmutability/issue-101739-2.rs b/tests/ui/transmutability/issue-101739-2.rs
index 8b36bf3dcb195..1c0bd29d70791 100644
--- a/tests/ui/transmutability/issue-101739-2.rs
+++ b/tests/ui/transmutability/issue-101739-2.rs
@@ -16,7 +16,7 @@ mod assert {
where
Dst: BikeshedIntrinsicFrom< //~ ERROR trait takes at most 2 generic arguments but 5 generic arguments were supplied
Src,
- ASSUME_ALIGNMENT,
+ ASSUME_ALIGNMENT, //~ ERROR: mismatched types
ASSUME_LIFETIMES,
ASSUME_VALIDITY,
ASSUME_VISIBILITY,
diff --git a/tests/ui/transmutability/issue-101739-2.stderr b/tests/ui/transmutability/issue-101739-2.stderr
index 519a374dc2294..38912696c18e3 100644
--- a/tests/ui/transmutability/issue-101739-2.stderr
+++ b/tests/ui/transmutability/issue-101739-2.stderr
@@ -9,6 +9,13 @@ LL | | ASSUME_VALIDITY,
LL | | ASSUME_VISIBILITY,
| |_____________________________- help: remove these generic arguments
-error: aborting due to 1 previous error
+error[E0308]: mismatched types
+ --> $DIR/issue-101739-2.rs:19:13
+ |
+LL | ASSUME_ALIGNMENT,
+ | ^^^^^^^^^^^^^^^^ expected `Assume`, found `bool`
+
+error: aborting due to 2 previous errors
-For more information about this error, try `rustc --explain E0107`.
+Some errors have detailed explanations: E0107, E0308.
+For more information about an error, try `rustc --explain E0107`.
diff --git a/tests/ui/typeck/issue-114918/const-in-impl-fn-return-type.rs b/tests/ui/typeck/issue-114918/const-in-impl-fn-return-type.rs
index 9fc249198d03d..193544ebd3fef 100644
--- a/tests/ui/typeck/issue-114918/const-in-impl-fn-return-type.rs
+++ b/tests/ui/typeck/issue-114918/const-in-impl-fn-return-type.rs
@@ -5,7 +5,7 @@
trait Trait {
- fn func<const N: u32>() -> [ (); N ]; //~ ERROR the constant `N` is not of type `usize`
+ fn func<const N: u32>() -> [ (); N ]; //~ ERROR mismatched types
}
struct S {}
diff --git a/tests/ui/typeck/issue-114918/const-in-impl-fn-return-type.stderr b/tests/ui/typeck/issue-114918/const-in-impl-fn-return-type.stderr
index bff926a2081ab..16aaf0615ed22 100644
--- a/tests/ui/typeck/issue-114918/const-in-impl-fn-return-type.stderr
+++ b/tests/ui/typeck/issue-114918/const-in-impl-fn-return-type.stderr
@@ -4,11 +4,11 @@ error[E0308]: mismatched types
LL | fn func<const N: u32>() -> [ (); { () }] {
| ^^ expected `usize`, found `()`
-error: the constant `N` is not of type `usize`
- --> $DIR/const-in-impl-fn-return-type.rs:8:32
+error[E0308]: mismatched types
+ --> $DIR/const-in-impl-fn-return-type.rs:8:38
|
LL | fn func<const N: u32>() -> [ (); N ];
- | ^^^^^^^^^ expected `usize`, found `u32`
+ | ^ expected `usize`, found `u32`
error: aborting due to 2 previous errors