replacement in rustfmt.toml at line 1
replacement in pijul-interaction/src/progress/terminal.rs at line 38
[5.1112]→[5.1112:1171](∅→∅) − fn boxed_clone(&self) -> Box<(dyn ProgressBarTrait)> {
+ fn boxed_clone(&self) -> Box<dyn ProgressBarTrait> {
replacement in pijul/src/commands/tag.rs at line 290
[10.5248]→[10.1141:1315](∅→∅) − chrono::DateTime::from_naive_utc_and_offset(
− chrono::NaiveDateTime::from_timestamp_opt(t, 0).unwrap(),
− chrono::Utc,
− )
+ chrono::DateTime::from_timestamp(t, 0).unwrap()
replacement in pijul/src/commands/tag.rs at line 299
− if let Ok(header) = toml::from_slice(&bytes) {
+ if let Ok(header) = toml::from_str(&std::str::from_utf8(&bytes)?) {
replacement in pijul/src/commands/record.rs at line 176
[10.208]→[7.217:298](∅→∅) − "signature": secret.sign_raw(&hash.to_bytes()).unwrap(),
+ "signature": secret.sign_raw(&hash_bytes).unwrap(),
replacement in pijul/src/commands/record.rs at line 270
[10.105980]→[10.128:189](∅→∅),
[10.189]→[10.103:232](∅→∅),
[10.103]→[10.103:232](∅→∅) − chrono::DateTime::from_naive_utc_and_offset(
− chrono::NaiveDateTime::from_timestamp_opt(t, 0).unwrap(),
− chrono::Utc,
− )
+ chrono::DateTime::from_timestamp(t, 0).unwrap()
edit in pijul/src/commands/record.rs at line 393
+ debug!("globalize done");
replacement in pijul/src/commands/record.rs at line 401
[10.403]→[10.788:789](∅→∅),
[10.15015]→[10.788:789](∅→∅),
[10.12734]→[10.788:789](∅→∅) + debug!("make change done");
replacement in pijul/src/commands/git.rs at line 766
[10.1476]→[8.0:68](∅→∅),
[8.68]→[10.50:207](∅→∅),
[6.382]→[10.50:207](∅→∅),
[10.159043]→[10.50:207](∅→∅),
[10.207]→[10.159129:159173](∅→∅),
[10.751]→[10.159129:159173](∅→∅),
[10.159129]→[10.159129:159173](∅→∅) − timestamp: chrono::DateTime::from_naive_utc_and_offset(
− chrono::NaiveDateTime::from_timestamp_opt(signature.when().seconds(), 0)
− .expect("seconds and nanos are within bounds"),
− chrono::Utc,
− ),
+ timestamp: chrono::DateTime::from_timestamp(signature.when().seconds(), 0).unwrap(),
replacement in pijul/Cargo.toml at line 58
[10.197381]→[10.15:35](∅→∅) replacement in pijul/Cargo.toml at line 70
[10.197652]→[10.197652:197665](∅→∅) replacement in pijul/Cargo.toml at line 72
[10.146]→[10.146:163](∅→∅),
[10.163]→[10.107:129](∅→∅),
[10.107]→[10.107:129](∅→∅) − thrussh = "0.33"
− thrussh-keys = "0.21"
+ thrussh = "0.35.4"
+ thrussh-keys = "0.22"
replacement in pijul/Cargo.toml at line 104
[10.279]→[10.309:310](∅→∅),
[10.373]→[10.309:310](∅→∅),
[10.472]→[10.309:310](∅→∅),
[10.1035]→[10.309:310](∅→∅),
[10.1190]→[10.309:310](∅→∅),
[10.1355]→[10.309:310](∅→∅),
[10.1493]→[10.309:310](∅→∅),
[10.1650]→[10.309:310](∅→∅),
[10.1704]→[10.309:310](∅→∅),
[10.1960]→[10.309:310](∅→∅),
[10.2300]→[10.309:310](∅→∅),
[10.4207]→[10.309:310](∅→∅),
[10.4307]→[10.309:310](∅→∅),
[10.8496]→[10.309:310](∅→∅),
[10.14078]→[10.309:310](∅→∅),
[10.16957]→[10.309:310](∅→∅),
[10.2859]→[10.309:310](∅→∅) + hex = { version = "0.4", optional = true }
replacement in oldshell.nix at line 1
− with import <nixpkgs> {};
+ with import <nixpkgs> {
+ overlays = map (uri: import (fetchTarball uri)) [
+ https://github.com/oxalica/rust-overlay/archive/master.tar.gz
+ ];
+ };
edit in oldshell.nix at line 16
+ (rust-bin.stable.latest.default.override {
+ targets = [
+ "x86_64-unknown-linux-gnu"
+ "x86_64-pc-windows-msvc"
+ ];
+ })
+ wine
edit in libpijul/src/text_encoding.rs at line 62
+
+ impl<'de> Visitor<'de> for EncodingVisitor {
+ type Value = Encoding;
+
+ fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+ formatter.write_str("a string label meeting the encoding standard https://encoding.spec.whatwg.org/#concept-encoding-get")
+ }
+
+ fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
+ where
+ E: serde::de::Error,
+ {
+ Ok(Encoding::for_label(v))
+ }
+ }
edit in libpijul/src/text_encoding.rs at line 83
[10.1080]→[10.1080:1610](∅→∅) − impl<'de> Visitor<'de> for EncodingVisitor {
− type Value = Encoding;
−
− fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
− formatter.write_str("a string label meeting the encoding standard https://encoding.spec.whatwg.org/#concept-encoding-get")
− }
−
− fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
− where
− E: serde::de::Error,
− {
− Ok(Encoding::for_label(v))
− }
− }
−
replacement in libpijul/src/pristine/mod.rs at line 124
[10.69025]→[10.101006:101075](∅→∅) − pub fn read(&self) -> parking_lot::RwLockReadGuard<T::Channel> {
+ pub fn read<'a>(&'a self) -> parking_lot::RwLockReadGuard<'a, T::Channel> {
replacement in libpijul/src/pristine/mod.rs at line 127
[10.69169]→[10.101098:101169](∅→∅) − pub fn write(&self) -> parking_lot::RwLockWriteGuard<T::Channel> {
+ pub fn write<'a>(&'a self) -> parking_lot::RwLockWriteGuard<'a, T::Channel> {
replacement in libpijul/src/pristine/mod.rs at line 143
[10.588200]→[10.101193:101256](∅→∅) − pub fn lock(&self) -> parking_lot::MutexGuard<Remote<T>> {
+ pub fn lock<'a>(&'a self) -> parking_lot::MutexGuard<'a, Remote<T>> {
replacement in libpijul/src/pristine/mod.rs at line 703
[10.37377]→[10.52521:52570](∅→∅) − pub(crate) fn iter_adjacent<'txn, T: GraphTxnT>(
+ pub fn iter_adjacent<'txn, T: GraphTxnT>(
replacement in libpijul/src/pristine/mod.rs at line 968
[10.608172]→[10.64901:65018](∅→∅) − pub(crate) fn make_changeid<T: GraphTxnT>(
− txn: &T,
− h: &Hash,
− ) -> Result<ChangeId, TxnErr<T::GraphError>> {
+ pub fn make_changeid<T: GraphTxnT>(txn: &T, h: &Hash) -> Result<ChangeId, TxnErr<T::GraphError>> {
replacement in libpijul/src/pristine/mod.rs at line 1576
[10.15833]→[10.15833:15891](∅→∅) − .map(|x| x.map(|x| x.into()))
+ .map(|x| x.map(|x| x.into()));
replacement in libpijul/src/pristine/mod.rs at line 1620
[10.16111]→[10.16111:16167](∅→∅) − .map(|x| x.map(From::from))
+ .map(|x| x.map(From::from));
replacement in libpijul/src/path.rs at line 81
[10.21]→[10.2817:2863](∅→∅),
[10.670198]→[10.2817:2863](∅→∅) − pub fn components(path: &str) -> Components {
+ pub fn components<'a>(path: &'a str) -> Components<'a> {
replacement in libpijul/src/path.rs at line 86
− pub fn components(path: &str) -> Components {
+ pub fn components<'a>(path: &'a str) -> Components<'a> {
replacement in libpijul/src/lib.rs at line 268
[10.729852]→[10.2970:3033](∅→∅) − fn iter_working_copy(&self) -> WorkingCopyIterator<Self> {
+ fn iter_working_copy<'a>(&'a self) -> WorkingCopyIterator<'a, Self> {
replacement in libpijul/src/lib.rs at line 404
[10.731450]→[10.127938:128038](∅→∅) − fn touched_files(&self, h: &pristine::Hash) -> Result<Option<Touched<Self>>, Self::DepsError> {
+ fn touched_files<'a>(
+ &'a self,
+ h: &pristine::Hash,
+ ) -> Result<Option<Touched<'a, Self>>, Self::DepsError> {
replacement in libpijul/src/fs.rs at line 432
[10.750130]→[10.106011:106067](∅→∅) − pub fn working_copy_children<T: TreeTxnT>(
− txn: &T,
+ pub fn working_copy_children<'a, T: TreeTxnT>(
+ txn: &'a T,
replacement in libpijul/src/fs.rs at line 435
[10.106085]→[10.106085:106137](∅→∅) − ) -> Result<WorkingCopyChildren<T>, T::TreeError> {
+ ) -> Result<WorkingCopyChildren<'a, T>, T::TreeError> {
replacement in libpijul/src/fs.rs at line 502
[10.751917]→[10.107025:107113](∅→∅) − pub fn iter_working_copy<T: TreeTxnT>(txn: &T, root: Inode) -> WorkingCopyIterator<T> {
+ pub fn iter_working_copy<'a, T: TreeTxnT>(txn: &'a T, root: Inode) -> WorkingCopyIterator<'a, T> {
replacement in libpijul/src/fs.rs at line 782
[10.18987]→[10.4169:4248](∅→∅) − return Some(Ok((grandparent.dest(), perms, basename)))
+ return Some(Ok((grandparent.dest(), perms, basename)));
replacement in libpijul/src/diff/bin.rs at line 5
[10.2618]→[10.2618:2649](∅→∅) − pub(super) fn make_old_chunks(
+ pub(super) fn make_old_chunks<'a>(
replacement in libpijul/src/diff/bin.rs at line 7
[10.2668]→[10.2668:2743](∅→∅) − a: &[u8],
− ) -> (HashMap<u32, Vec<(usize, &[u8])>>, Vec<super::Line>) {
+ a: &'a [u8],
+ ) -> (HashMap<u32, Vec<(usize, &'a [u8])>>, Vec<super::Line<'a>>) {
replacement in libpijul/src/changestore/filesystem.rs at line 142
[10.826014]→[10.71:141](∅→∅) − std::cell::RefMut<lru_cache::LruCache<ChangeId, ChangeFile>>,
+ std::cell::RefMut<'a, lru_cache::LruCache<ChangeId, ChangeFile>>,
replacement in libpijul/src/change/parse.rs at line 553
[10.77264]→[10.77264:77330](∅→∅) − fn parse_fragment(input: &str) -> IResult<&str, StringFragment> {
+ fn parse_fragment<'a>(input: &'a str) -> IResult<&'a str, StringFragment<'a>> {