chore(3p/sources): bump channels & overlays (2024-12-31)
Last one of the year! С наступающим)
Fixes:
* users/wpcarro: remove use-package from emacs packages (it has been built-in
for a while now)
* users/sterni: the same thing
* users/aspen: remove `coz`, forwardport `gdmap` from stable
* users/flokli: dropped corneish_zen firmware from CI
This firmware depends on a non-reproducible FOD which, when updated, causes
build failures. We have worked around this repeatedly, but it needs to be
fixed properly.
* tvix: regenerate Go protobufs
* tvix: address new clippy lints
* tvix/{castore,store,build}-go: update grpc/protobuf libraries
* tvix/eval: formatting fixes
* 3p/overlays/tvl: work around GCC 14 -Werrors
Change-Id: Ice5948ca7780192fb7d2abc6a48971fb875f03c9
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12933
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: aspen <root@gws.fyi>
Autosubmit: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
This commit is contained in:
parent
bd73dff0bf
commit
54f72afcda
44 changed files with 516 additions and 578 deletions
|
|
@ -506,7 +506,7 @@ impl<'a> Iterator for Iter<KeyValue<'a>> {
|
|||
}
|
||||
}
|
||||
|
||||
impl<'a> ExactSizeIterator for Iter<KeyValue<'a>> {
|
||||
impl ExactSizeIterator for Iter<KeyValue<'_>> {
|
||||
fn len(&self) -> usize {
|
||||
match &self.0 {
|
||||
KeyValue::Empty => 0,
|
||||
|
|
@ -554,7 +554,7 @@ impl<'a> IntoIterator for &'a NixAttrs {
|
|||
}
|
||||
}
|
||||
|
||||
impl<'a> ExactSizeIterator for Keys<'a> {
|
||||
impl ExactSizeIterator for Keys<'_> {
|
||||
fn len(&self) -> usize {
|
||||
match &self.0 {
|
||||
KeysInner::Empty => 0,
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ static WRITE_FLOAT_OPTIONS: LazyLock<lexical_core::WriteFloatOptions> = LazyLock
|
|||
/// type, or a type error. This only works for types that implement
|
||||
/// `Copy`, as returning a reference to an inner thunk value is not
|
||||
/// possible.
|
||||
|
||||
///
|
||||
/// Generate an `as_*/to_*` accessor method that returns either the
|
||||
/// expected type, or a type error.
|
||||
macro_rules! gen_cast {
|
||||
|
|
|
|||
|
|
@ -5,10 +5,8 @@ use std::path::PathBuf;
|
|||
/// src/libutil/util.cc of cppnix. Currently it does not match that
|
||||
/// behavior; it uses the `path_clean` library which is based on the
|
||||
/// Go standard library
|
||||
///
|
||||
/// TODO: make this match the behavior of cppnix
|
||||
/// TODO: write tests for this
|
||||
|
||||
// TODO: make this match the behavior of cppnix
|
||||
// TODO: write tests for this
|
||||
pub fn canon_path(path: PathBuf) -> PathBuf {
|
||||
path.clean()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -307,7 +307,7 @@ thread_local! {
|
|||
/// represented as a single *thin* pointer to a packed data structure containing the
|
||||
/// [context][NixContext] and the string data itself (which is a raw byte array, to match the Nix
|
||||
/// string semantics that allow any array of bytes to be represented by a string).
|
||||
|
||||
///
|
||||
/// This memory representation is documented in [`NixStringInner`], but since Rust prefers to deal
|
||||
/// with slices via *fat pointers* (pointers that include the length in the *pointer*, not in the
|
||||
/// heap allocation), we have to do mostly manual layout management and allocation for this
|
||||
|
|
@ -506,7 +506,7 @@ impl<'de> Deserialize<'de> for NixString {
|
|||
{
|
||||
struct StringVisitor;
|
||||
|
||||
impl<'de> Visitor<'de> for StringVisitor {
|
||||
impl Visitor<'_> for StringVisitor {
|
||||
type Value = NixString;
|
||||
|
||||
fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
|
||||
|
|
@ -729,9 +729,8 @@ impl NixString {
|
|||
/// referring to their `drvPath`, i.e. their full sources and binary closure.
|
||||
/// It yields derivation paths.
|
||||
pub fn iter_ctx_derivation(&self) -> impl Iterator<Item = &str> {
|
||||
return self
|
||||
.iter_context()
|
||||
.flat_map(|context| context.iter_derivation());
|
||||
self.iter_context()
|
||||
.flat_map(|context| context.iter_derivation())
|
||||
}
|
||||
|
||||
/// Iterates over "single" context elements, e.g. single derived paths,
|
||||
|
|
@ -739,9 +738,8 @@ impl NixString {
|
|||
/// The first element of the tuple is the output name
|
||||
/// and the second element is the derivation path.
|
||||
pub fn iter_ctx_single_outputs(&self) -> impl Iterator<Item = (&str, &str)> {
|
||||
return self
|
||||
.iter_context()
|
||||
.flat_map(|context| context.iter_single_outputs());
|
||||
self.iter_context()
|
||||
.flat_map(|context| context.iter_single_outputs())
|
||||
}
|
||||
|
||||
/// Returns whether this Nix string possess a context or not.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue