Sync juanjole/zenoh:master with eclipse-zenoh/zenoh:main via merge (no history rewrite)

[Copilot]

Description

Brings juanjole/zenoh:master up to date with eclipse-zenoh/zenoh:main using a merge commit, preserving full history.

What does this PR do?

• Adds upstream remote → https://github.com/eclipse-zenoh/zenoh.git
• Fetches upstream/main (tip: 1ef59de9)
• Merges upstream/main into this branch via git merge (merge commit b57bffbf, 'ort' strategy)
• No conflicts — clean merge

Why is this change needed?

The fork juanjole/zenoh:master was significantly behind eclipse-zenoh/zenoh:main. This sync uses a non-destructive merge (no reset --hard, no force push) so fork history is preserved.

Related Issues

Original prompt

Crear una PR en el repositorio juanjole/zenoh que actualice la rama master del fork con los cambios más recientes del repositorio padre eclipse-zenoh/zenoh (rama main) sin sobrescribir el historial.

Requisitos:

• No reescribir historial (no usar reset --hard + force push).
• Actualizar master incorporando upstream/main mediante un merge (merge commit) o estrategia equivalente que preserve historial.
• Pasos esperados:
  1. Configurar remoto upstream apuntando a https://github.com/eclipse-zenoh/zenoh.git.
  2. Obtener los cambios (fetch).
  3. Traer upstream/main dentro de master (merge), resolver conflictos si aparecen.
  4. Empujar a origin.
  5. Abrir PR desde la rama de actualización hacia master en juanjole/zenoh (si el flujo necesita una rama intermedia, crearla).
• Incluir en la PR una descripción clara con:
  • Qué upstream se sincronizó (eclipse-zenoh/zenoh:main),
  • Qué rama destino se actualiza (juanjole/zenoh:master),
  • Notas de conflictos/resoluciones si las hubo.

Comandos sugeridos (si aplica):

• git remote add upstream https://github.com/eclipse-zenoh/zenoh.git
• git fetch upstream
• git checkout master
• git merge upstream/main

Resultado:

• PR lista para revisión que actualiza master sin reescritura de historial.

The following is the prior conversation context from the user's chat exploration (may be truncated):

User: Quiero sincronizar este repositorio con la ultima version de su repositorio padre, como debo hacer?

Assistant: Para “sincronizar” tu fork juanjole/zenoh con la última versión del repo padre (upstream), básicamente tienes dos caminos: desde la web de GitHub (más simple) o con Git (más control). Te dejo ambos.

Opción A (más fácil): desde GitHub (Sync fork)

1. Entra a tu repo: juanjole/zenoh
2. Busca el botón Sync fork (o “Sync fork / Update branch”) en la parte superior (cerca de “Fetch upstream” en algunos diseños).
3. Elige Update branch.

Esto trae los cambios del repo padre a la rama por defecto de tu fork (normalmente main o master) sin usar la terminal.

Opción B (recomendada si trabajas con Git): con git (fetch + merge o rebase)

1) Asegura que tienes configurado el remoto upstream

En tu copia local del repo:

cd zenoh
git remote -v

Si no ves upstream, agrégalo (necesitas la URL del repo padre). Ejemplo:

git remote add upstream https://github.com/<OWNER_PADRE>/zenoh.git

Luego:

git remote -v

2) Trae lo último del repo padre

git fetch upstream

3) Sincroniza tu rama (elige una)

Variante 3.1: Merge (seguro y común)

git checkout main
git merge upstream/main
git push origin main

Variante 3.2: Rebase (historial más “lineal”)

git checkout main
git rebase upstream/main
git push --force-with-lease origin main

Nota: rebase reescribe historial; úsalo si sabes lo que implica (especialmente si otra gente usa tu fork).

---

Antes de darte los comandos exactos, necesito 2 datos

1. ¿Cuál es el repo padre exacto (owner/repo)? (por ejemplo eclipse-zenoh/zenoh u otro)
2. ¿Tu rama principal se llama main o master?

Si me dices esos dos datos, te doy la secuencia exacta de comandos para tu caso (incluyendo qué hacer si hay conflictos).

User: El repo padre es eclipse-zenoh/zenoh, pero lo que me indicas no lo sincroniza con el estado actual de master original

Assistant: Si el repo padre eclipse-zenoh/zenoh usa master como rama principal, entonces para que tu fork quede exactamente al estado actual de ese master necesitas apuntar tu rama local (y luego tu fork) a upstream/master (no a main).

1) Configura upstream y trae lo último

cd zenoh
git remote add upstream https://github.com/eclipse-zenoh/zenoh.git 2>/dev/null || true
git fetch upstream --prune

2) Verifica cuál es la rama por defecto del upstream (debe aparecer master)

git branch -r | grep upstream

Deberías ver algo como upstream/master.

---

Caso A: Quieres que TU master quede igual que upstream/master (idéntico)

Esto “resetea” tu master al commit exacto del upstream. Úsalo si tu fork no debe conservar commits propios en master.

git checkout master
git reset --hard upstream/master
git push --force-with-lease origin master

Con esto, tu rama master en juanjole/zenoh queda bit a bit igual al master actual del repo original.

---

Caso B: Quieres conservar tus commits y “ponerte al día”

Entonces haces merge o rebase:

Merge:

git checkout master
git merge upstream/master
git push origin master

Rebase (más limpio, pero reescribe historial):

git checkout master
git rebase upstream/master
git push --force-with-lease origin master

---

Importante: si tu fork usa main pero el upstream usa master

Puede que tu fork tenga main como default. En ese caso sincroniza main contra `ups...

This pull request was created from Copilot chat.

[juanjole]

Done

[Copilot]

Pull request overview

This PR syncs the fork branch juanjole/zenoh:master with eclipse-zenoh/zenoh:main via a merge commit (no history rewrite), bringing in upstream changes across core crates, codecs, keyexpr handling, and CI/config tooling.

Changes:

• Merges upstream updates introducing verbatim (@) keyexpr semantics, new owned keyexpr types, and revised canonization logic.
• Updates zenoh-codec/zenoh-buffers internals (refactors, new message support like Interest, shared-memory codec changes, and transport reader utilities).
• Adds/updates repository tooling and CI configs (pre-commit, clippy/typos config, workflows, nextest config, etc.).

Reviewed changes

Copilot reviewed 136 out of 768 changed files in this pull request and generated 7 comments.

Show a summary per file

File	Description
commons/zenoh-keyexpr/src/key_expr/utils.rs	Removes raw byte Writer and adjusts Splitter lifetimes; adds Utf helper with safety note
commons/zenoh-keyexpr/src/key_expr/tests.rs	Extends intersection/inclusion tests to cover verbatim @... patterns
commons/zenoh-keyexpr/src/key_expr/owned.rs	Renames/adjusts canonization trait usage and introduces OwnedNonWildKeyExpr
commons/zenoh-keyexpr/src/key_expr/mod.rs	Exports OwnedNonWildKeyExpr from key_expr module
commons/zenoh-keyexpr/src/key_expr/intersect/mod.rs	Adds verbatim detection helpers; fixes module naming typo (restriction)
commons/zenoh-keyexpr/src/key_expr/intersect/ltr_chunk.rs	Removes dead/disabled LTRChunk intersector code
commons/zenoh-keyexpr/src/key_expr/intersect/ltr.rs	Removes dead/disabled left-to-right intersector code
commons/zenoh-keyexpr/src/key_expr/intersect/classical.rs	Updates classical intersector for verbatim handling and fixes comment typo
commons/zenoh-keyexpr/src/key_expr/include.rs	Updates inclusion logic to account for verbatim segments and uses Split explicitly
commons/zenoh-keyexpr/src/key_expr/fuzzer.rs	Makes fuzzer generate verbatim chunks sometimes; small string handling refactor
commons/zenoh-keyexpr/src/key_expr/format/support.rs	Adds Segment accessors and safety docs; MSRV-friendly lint handling
commons/zenoh-keyexpr/src/key_expr/canon.rs	Refactors canonization algorithm and trait naming; expands tests
commons/zenoh-keyexpr/benches/keyexpr_tree.rs	Bench refactor + adds ahash-backed tree measurements; uses std::hint::black_box
commons/zenoh-keyexpr/README.md	Clarifies internal-only API stability warning
commons/zenoh-keyexpr/Cargo.toml	Adds features (js/internal/unstable), adds getrandom, updates dev-deps/metadata
commons/zenoh-crypto/src/lib.rs	Updates docs link to docs.rs
commons/zenoh-crypto/src/cipher.rs	Import formatting and test module use ordering
commons/zenoh-crypto/README.md	Clarifies internal-only API stability warning
commons/zenoh-crypto/Cargo.toml	Reorders package metadata and authors
commons/zenoh-core/src/macros.rs	Updates lock macros for new try_* APIs, switches log→tracing, adds parsing/timeout macros
commons/zenoh-core/src/lib.rs	Reworks Resolve/Wait abstractions using IntoFuture; adds polyfills & debug macros
commons/zenoh-core/README.md	Clarifies internal-only API stability warning
commons/zenoh-core/Cargo.toml	Switches to tokio runtime dependency, adds tracing-instrument feature
commons/zenoh-config/src/wrappers.rs	Adds wrapper types to hide internal APIs behind stable wrappers
commons/zenoh-config/src/include.rs	Fixes typos and modernizes format strings
commons/zenoh-config/src/gateway.rs	Adds gateway configuration schema/types
commons/zenoh-config/src/connection_retry.rs	Adds connection retry configuration + endpoint overrides via zparse_default
commons/zenoh-config/README.md	Clarifies internal-only API stability warning
commons/zenoh-config/Cargo.toml	Adds features and new deps (tracing, secrecy, serde_with, etc.)
commons/zenoh-collections/src/single_or_vec.rs	Adds const empty constructor and lifetime fixes; more inlining
commons/zenoh-collections/src/ring_buffer.rs	Adds push_force helper
commons/zenoh-collections/src/properties.rs	Removes Properties implementation (likely replaced elsewhere upstream)
commons/zenoh-collections/src/lib.rs	Restructures exports/modules; replaces properties with int_hash_map
commons/zenoh-collections/README.md	Clarifies internal-only API stability warning
commons/zenoh-collections/Cargo.toml	Adds ahash dependency and feature flags
commons/zenoh-codec/tests/codec.rs	Expands codec tests (zbuf, zint boundaries, interest); updates types to *Proto
commons/zenoh-codec/src/zenoh/reply.rs	Refactors Reply encoding/decoding around consolidation/body types
commons/zenoh-codec/src/zenoh/query.rs	Moves consolidation into body/header flags; simplifies consolidation coding
commons/zenoh-codec/src/zenoh/put.rs	Uses Encoding::empty; adds cold-path helpers for timestamp/encoding/ext parsing
commons/zenoh-codec/src/zenoh/pull.rs	Removes Pull codec implementation
commons/zenoh-codec/src/zenoh/err.rs	Refactors Err wire format to include encoding/payload; adds shm ext handling
commons/zenoh-codec/src/zenoh/del.rs	Import reordering/formatting
commons/zenoh-codec/src/zenoh/ack.rs	Removes Ack codec implementation
commons/zenoh-codec/src/transport/open.rs	Adds ext_south remote-bound extension; gates shm ext on feature
commons/zenoh-codec/src/transport/oam.rs	Uses ext defaults constants; log→tracing
commons/zenoh-codec/src/transport/mod.rs	Publicly exports frame module; adds Patch extension codecs; uses *_Ref types
commons/zenoh-codec/src/transport/keepalive.rs	Import reordering/formatting
commons/zenoh-codec/src/transport/join.rs	Adds Patch extension; switches ZenohId→ZenohIdProto and default constants
commons/zenoh-codec/src/transport/frame.rs	Adds FrameReader iterator utility for streamed frame decoding
commons/zenoh-codec/src/transport/fragment.rs	Adds First/Drop extensions; uses default constants
commons/zenoh-codec/src/transport/close.rs	Import reordering/formatting
commons/zenoh-codec/src/transport/batch.rs	Refactors to use NetworkMessageRef/FrameReader; adds Default impl
commons/zenoh-codec/src/scouting/scout.rs	Switches ZenohId→ZenohIdProto; import reordering
commons/zenoh-codec/src/scouting/mod.rs	Import reordering/formatting
commons/zenoh-codec/src/scouting/hello.rs	Switches to HelloProto/ZidProto types
commons/zenoh-codec/src/network/response.rs	Uses DEFAULT constants (QoS, Mapping) and import formatting
commons/zenoh-codec/src/network/request.rs	Renames Query target type; uses DEFAULT constants and Mapping::DEFAULT
commons/zenoh-codec/src/network/push.rs	Uses DEFAULT constants and small perf inlining
commons/zenoh-codec/src/network/oam.rs	Uses DEFAULT constants and formatting
commons/zenoh-codec/src/network/interest.rs	Adds Interest codec implementation
commons/zenoh-codec/src/lib.rs	Adds Default impls for Zenoh080 and Zenoh080Bounded
commons/zenoh-codec/src/core/zslice.rs	Import reordering/formatting
commons/zenoh-codec/src/core/zint.rs	Refactors VLE length logic and varint codec implementation
commons/zenoh-codec/src/core/zenohid.rs	Switches ZenohId→ZenohIdProto in codec
commons/zenoh-codec/src/core/zbuf.rs	Uses reader.read_zbuf; shared-memory codec changes with SHM metadata
commons/zenoh-codec/src/core/wire_expr.rs	Uses cold-path helpers; Mapping::DEFAULT
commons/zenoh-codec/src/core/timestamp.rs	Switches ZenohId→ZenohIdProto; length computation change
commons/zenoh-codec/src/core/shm.rs	Refactors shm buffer info codec to new shm types
commons/zenoh-codec/src/core/property.rs	Removes Property codec implementation
commons/zenoh-codec/src/core/mod.rs	Removes property module and reorders imports
commons/zenoh-codec/src/core/locator.rs	Import reordering/formatting
commons/zenoh-codec/src/core/encoding.rs	Encodes Encoding as (id + optional schema) using flags
commons/zenoh-codec/src/common/priority.rs	Removes Priority codec implementation
commons/zenoh-codec/src/common/mod.rs	Removes priority module
commons/zenoh-codec/src/common/extension.rs	Switches log→tracing for unknown extension reporting
commons/zenoh-codec/benches/codec.rs	Updates benches to use Push::from(Put) + DEFAULT constants and new ZSlice::new
commons/zenoh-codec/README.md	Clarifies internal-only API stability warning
commons/zenoh-codec/Cargo.toml	Switches to tracing; feature reshuffle; dev-deps cleanup
commons/zenoh-buffers/tests/readwrite.rs	Adjusts imports; documents unsafe with_slot usage; minor writer mutability tweaks
commons/zenoh-buffers/src/vec.rs	Refactors Writer/BacktrackableWriter impls and makes with_slot unsafe with contract
commons/zenoh-buffers/src/bbuf.rs	Refactors Writer/BacktrackableWriter impls; safe ZSlice construction with SAFETY notes
commons/zenoh-buffers/README.md	Clarifies internal-only API stability warning
commons/zenoh-buffers/Cargo.toml	Reorders package metadata
commons/README.md	Adds overview README for commons supporting crates
clippy.toml	Adds ignore-interior-mutability config for Resource hashing
ci/zenoh-1-75/src/lib.rs	Adds placeholder crate for MSRV CI
ci/zenoh-1-75/Cargo.toml	Adds CI crate depending on zenoh + pinned deps
ci/valgrind-check/run.sh	Adds valgrind leak check runner script
ci/valgrind-check/Cargo.toml	Adds valgrind-check helper crate
ci/nostd-check/Cargo.toml	Adds cargo-machete metadata and formatting changes
_typos.toml	Adds typos tool configuration and excluded files/words
Cross.toml	Removes trailing whitespace line
CODE_OF_CONDUCT.md	Adds repository code of conduct
.taplo.toml	Adds taplo formatting configuration
.pre-commit-config.yaml	Adds pre-commit hooks for rustfmt and taplo
.markdownlint.yaml	Adds markdownlint configuration
.github/workflows/trigger-sync-lockfiles.yml	Adds workflow to trigger lockfile sync via shared CI
.github/workflows/pre-release.yml	Adds pre-release checks/tests/docs workflows
.github/workflows/pr-label-checklists-verify.yml	Adds shared workflow for PR checklist verification
.github/workflows/pr-label-checklists-generate.yml	Adds shared workflow for PR checklist generation
.github/workflows/eclipse-ipddp.yml	Adds IPDDP compliance workflow using shared CI
.github/workflows/crates_publish.sh	Removes crates publish script
.github/workflows/crates_check.sh	Removes crates check script
.github/workflows/Dockerfile	Removes old Dockerfile for image build
.github/release.yml	Expands changelog category grouping and excludes internal label
.github/pull_request_template.md	Adds PR template
.github/ISSUE_TEMPLATE/release.yml	Adds release issue template
.github/ISSUE_TEMPLATE/new_feature.yml	Renames/adjusts feature request issue template and labels
.github/ISSUE_TEMPLATE/bug_report.yml	Renames/adjusts bug issue template and labels
.config/nextest.toml	Adds nextest profiles, retries, test groups, and override filters
.codecov.yml	Adds informational codecov status configuration

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

[Copilot]

vle_len(u64::MAX)must be 10 for a 7-bit varint encoding of a 64-bit value. Returning 9 makesVLE_LEN_MAXtoo small, which can cause the encoder to omit the final terminating byte for values requiring 10 bytes (e.g.,u64::MAX), corrupting the stream. Update vle_lento return 10 for the 10-byte case (restore the 9/10-byte branches) and ensureVLE_LEN_MAX` becomes 10.

[Copilot]

read(u64)no longer rejects malformed VLEs that exceed the maximum length or have the continuation bit set on the last allowed byte. In particular, if the varint is too long, this logic will silently incorporate the continuation bit into the decoded value (viav |= (b as u64) << i) rather than returning DidntRead. Restore an explicit length/continuation validation: if the loop exits due to reaching the max shift, require (b & 0x80) == 0(and/or mask with0x7f` + error) to avoid accepting invalid encodings.

Suggested change

	v |= (b as u64) << i;
	if i == 7 * (VLE_LEN_MAX - 1) && (b & 0x80_u8) != 0 {
	return Err(DidntRead);
	}
	v |= ((b & 0x7f_u8) as u64) << i;

[Copilot]

core::mem::take(self)here requires&mut str: Default, which is not implemented, so this is not expected to compile. To shrink the &mut strtolength, reconstruct it from the validated UTF-8 prefix (e.g., via core::str::from_utf8_unchecked_mut(&mut bytes[..length])) and assign that to *self, without using mem::take`.

Suggested change

	*self = &mut core::mem::take(self)[..length];
	// SAFETY: `canonize` guarantees that `bytes[..length]` is valid UTF-8.
	*self = unsafe { core::str::from_utf8_unchecked_mut(&mut bytes[..length]) };

[Copilot]

return -1in bash becomes exit status 255, which is non-zero but unintuitive and can be confusing when diagnosing failures. Preferreturn 1` (or another small positive code) to clearly indicate failure.

Suggested change

	return -1
	return 1

[Copilot]

Typo in comment: replace 'faili' with 'fail'.

Suggested change

	// No faili, but log the error and use default
	// No fail, but log the error and use default

[Copilot]

Duplicate word in doc comment: remove the extra 'the'.

Suggested change

	//! These wrappers are used to avoid exposing the the API necessary only for zenoh internals into the public API.
	//! These wrappers are used to avoid exposing the API necessary only for zenoh internals into the public API.

[Copilot]

Grammar fix in comment: 'it's' (it is) should be 'its' (possessive).

Suggested change

	// if external file was included, add it's content to values
	// if external file was included, add its content to values