##// END OF EJS Templates
rust: fix unsound `OwningDirstateMap`...
rust: fix unsound `OwningDirstateMap` As per the previous patch, `OwningDirstateMap` is unsound. Self-referential structs are difficult to implement correctly in Rust since the compiler is free to move structs around as much as it wants to. They are also very rarely needed in practice, so the state-of-the-art on how they should be done within the Rust rules is still a bit new. The crate `ouroboros` is an attempt at providing a safe way (in the Rust sense) of declaring self-referential structs. It is getting a lot attention and was improved very quickly when soundness issues were found in the past: rather than relying on our own (limited) review circle, we might as well use the de-facto common crate to fix this problem. This will give us a much better chance of finding issues should any new ones be discovered as well as the benefit of fewer `unsafe` APIs of our own. I was starting to think about how I would present a safe API to the old struct but soon realized that the callback-based approach was already done in `ouroboros`, along with a lot more care towards refusing incorrect structs. In short: we don't return a mutable reference to the `DirstateMap` anymore, we expect users of its API to pass a `FnOnce` that takes the map as an argument. This allows our `OwningDirstateMap` to control the input and output lifetimes of the code that modifies it to prevent such issues. Changing to `ouroboros` meant changing every API with it, but it is relatively low churn in the end. It correctly identified the example buggy modification of `copy_map_insert` outlined in the previous patch as violating the borrow rules. Differential Revision: https://phab.mercurial-scm.org/D12429

File last commit:

r49350:35ebe6f8 default
r49857:c9f44fc9 stable
Show More
exceptions.rs
70 lines | 2.3 KiB | application/rls-services+xml | RustLexer
Georges Racinet
rust-cpython: rustdoc improvements...
r41220 // ancestors.rs
//
// Copyright 2018 Georges Racinet <gracinet@anybox.fr>
//
// This software may be used and distributed according to the terms of the
// GNU General Public License version 2 or any later version.
//! Bindings for Rust errors
//!
//! [`GraphError`] exposes `hg::GraphError` as a subclass of `ValueError`
Georges Racinet
rust: error for WdirUnsupported with cpython conversion as exception...
r41385 //! but some variants of `hg::GraphError` can be converted directly to other
//! existing Python exceptions if appropriate.
Georges Racinet
rust-cpython: rustdoc improvements...
r41220 //!
//! [`GraphError`]: struct.GraphError.html
Raphaël Gomès
rust: switch hg-core and hg-cpython to rust 2018 edition...
r42828 use cpython::{
Raphaël Gomès
rust-filepatterns: remove bridge code for filepatterns-related functions...
r44589 exc::{RuntimeError, ValueError},
Raphaël Gomès
rust: switch hg-core and hg-cpython to rust 2018 edition...
r42828 py_exception, PyErr, Python,
};
Georges Racinet
rust-cpython: start cpython crate bindings...
r41001 use hg;
py_exception!(rustext, GraphError, ValueError);
impl GraphError {
pub fn pynew(py: Python, inner: hg::GraphError) -> PyErr {
match inner {
hg::GraphError::ParentOutOfRange(r) => {
GraphError::new(py, ("ParentOutOfRange", r))
}
Georges Racinet
rust: error for WdirUnsupported with cpython conversion as exception...
r41385 hg::GraphError::WorkingDirectoryUnsupported => {
match py
.import("mercurial.error")
.and_then(|m| m.get(py, "WdirUnsupported"))
Raphaël Gomès
rust: run rfmt on all hg-core/hg-cpython code...
r42760 {
Err(e) => e,
Ok(cls) => PyErr::from_instance(py, cls),
}
Raphaël Gomès
rust-filepatterns: add `rust-cpython` bindings for `filepatterns`...
r42515 }
}
}
pacien
hg-cpython: use ancestor iterator impls from vcsgraph...
r49350
pub fn pynew_from_vcsgraph(
py: Python,
inner: vcsgraph::graph::GraphReadError,
) -> PyErr {
match inner {
vcsgraph::graph::GraphReadError::InconsistentGraphData => {
GraphError::new(py, "InconsistentGraphData")
}
vcsgraph::graph::GraphReadError::InvalidKey => {
GraphError::new(py, "ParentOutOfRange")
}
vcsgraph::graph::GraphReadError::KeyedInvalidKey(r) => {
GraphError::new(py, ("ParentOutOfRange", r))
}
vcsgraph::graph::GraphReadError::WorkingDirectoryUnsupported => {
match py
.import("mercurial.error")
.and_then(|m| m.get(py, "WdirUnsupported"))
{
Err(e) => e,
Ok(cls) => PyErr::from_instance(py, cls),
}
}
}
}
Raphaël Gomès
rust-filepatterns: add `rust-cpython` bindings for `filepatterns`...
r42515 }
Raphaël Gomès
rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 py_exception!(rustext, HgPathPyError, RuntimeError);
Raphaël Gomès
rust-status: update rust-cpython bridge to account for the changes in core...
r45016 py_exception!(rustext, FallbackError, RuntimeError);
py_exception!(shared_ref, AlreadyBorrowed, RuntimeError);