Merge remote-tracking branch 'origin/master'

README.md

@@ -40,11 +40,6 @@ Welcome to the main repository for Aura, a secure, multilingual package manager
 Check out [The Aura Book](https://fosskers.github.io/aura/) for all knowledge
 and usage instructions!
 
-If Aura has made your life easier, please consider [buying me a
-coffee](https://www.buymeacoffee.com/fosskers) :coffee: or supporting Aura
-through [Github Sponsors](https://github.com/sponsors/fosskers) :octocat:. Your
-help goes a long way!
-
 <!-- markdown-toc start - Don't edit this section. Run M-x markdown-toc-refresh-toc -->
 
 **Table of Contents**
@@ -69,6 +64,7 @@ help goes a long way!
     - [Managing Orphan Packages](#managing-orphan-packages)
     - [PKGBUILD Security Analysis](#pkgbuild-security-analysis)
   - [Configuration](#configuration)
+  - [Mailing List](#mailing-list)
   - [Localisation](#localisation)
   - [Credits](#credits)
 - [The `aur` Haskell Library](#the-aur-haskell-library)
@@ -235,6 +231,10 @@ isn't present. A template config file [can be found here](aura/doc/aura.conf)
 and contains all instructions. If you install Aura via its AUR package, this
 file is added for you.
 
+## Mailing List
+
+You can join Aura's mailing list here: https://lists.sr.ht/~fosskers/aura
+
 ## Localisation
 
 As mentioned in the Philosophy above, adding new languages to Aura is quite
@@ -245,13 +245,6 @@ Aura Book.
 
 ## Credits
 
-Aura is sponsored by these wonderful people:
-
-[<img class="avatar avatar-user" src="https://avatars.githubusercontent.com/u/81970309?s=70&amp;v=4" alt="@ace-deuce" width="35" height="35">](https://github.com/ace-deuce)
-[<img class="avatar avatar-user" src="https://avatars.githubusercontent.com/u/81332165?s=70&amp;v=4" alt="@tianip220" width="35" height="35">](https://github.com/tianip220)
-[<img class="avatar avatar-user" src="https://avatars.githubusercontent.com/u/5953670?s=70&amp;v=4" alt="@sidagrawal" width="35" height="35">](https://github.com/sidagrawal)
-[<img class="avatar avatar-user" src="https://avatars.githubusercontent.com/u/17126777?s=70&amp;v=4" alt="@da-moon" width="35" height="35">](https://github.com/da-moon)
-
 Aura has been translated by these generous people:
 
 | Language   | Translators                                     |

rust/aura-core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "aura-core"
-version = "0.1.1"
+version = "0.1.3"
 authors = ["Colin Woodbury <colin@fosskers.ca>"]
 edition = "2021"
 description = "Core types and logic for extended Arch Linux package managers."

rust/aura-core/src/faur.rs

@@ -11,35 +11,43 @@ pub const FAUR_URL: &str = "https://faur.fosskers.ca";
 #[serde(rename_all = "PascalCase")]
 pub struct Package {
     /// Dependencies only necessary for testing.
+    #[serde(default)]
     pub check_depends: Vec<String>,
     /// Packages which cannot be installed at the same time as this one.
+    #[serde(default)]
     pub conflicts: Vec<String>,
     /// Runtime dependencies.
+    #[serde(default)]
     pub depends: Vec<String>,
     /// The general description of the package.
     pub description: Option<String>,
     /// Timestamp of the first uploading of this package to the AUR.
     pub first_submitted: u64,
     /// Package groups this package belongs to.
+    #[serde(default)]
     pub groups: Vec<String>,
     /// An internal identifier.
     #[serde(rename = "ID")]
     pub id: u64,
     /// General categories this package belongs to.
+    #[serde(default)]
     pub keywords: Vec<String>,
     /// Timestamp of the latest upload of this package.
     pub last_modified: u64,
     /// The software LICENSE in use by this package.
+    #[serde(default)]
     pub license: Vec<String>,
     /// The maintainer of the AUR package.
     pub maintainer: Option<String>,
     /// Dependencies only necessary at build time.
+    #[serde(default)]
     pub make_depends: Vec<String>,
     /// The normal name of this package.
     pub name: String,
     /// The number of votes received on the AUR.
     pub num_votes: u64,
     /// Optional runtime depedencies.
+    #[serde(default)]
     pub opt_depends: Vec<String>,
     /// Timestamp of an Out-of-date report on the AUR.
     pub out_of_date: Option<u64>,
@@ -55,9 +63,11 @@ pub struct Package {
     pub popularity: f64,
     /// Package names that this package "counts as" if installed. For instance,
     /// `aura-bin` "counts as" `aura` for the purpose of dependency resolution.
+    #[serde(default)]
     pub provides: Vec<String>,
     /// If package is installed, the packages named in `replaces` should be
     /// uninstalled.
+    #[serde(default)]
     pub replaces: Vec<String>,
     /// The URL of the original project.
     #[serde(rename = "URL")]

rust/aura-core/src/log.rs

@@ -25,7 +25,7 @@ pub fn info(path: &Path, package: String) -> Option<LogEntry> {
     let patt = format!(" {} (", package);
     let hits = read
         .lines()
-        .filter_map(|line| line.ok())
+        .map_while(Result::ok)
         .filter(|line| line.contains(&patt))
         .collect::<Vec<_>>();
 

rust/aura-pm/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "aura-pm"
-version = "4.0.0-alpha6"
+version = "4.0.0-alpha8"
 authors = ["Colin Woodbury <colin@fosskers.ca>"]
 edition = "2021"
 description = "Install and manage Arch Linux packages."
@@ -14,7 +14,7 @@ name = "aura"
 path = "src/main.rs"
 
 [dependencies]
-aura-core = { version = "0.1.1", path = "../aura-core" }
+aura-core = { version = "0.1.3", path = "../aura-core" }
 r2d2-alpm = { version = "0.1", path = "../r2d2-alpm" }
 
 alpm = "2.2"
@@ -29,11 +29,11 @@ itertools = "0.10"
 linya = "0.3"
 log = "0.4"
 nonempty = "0.8"
-num_cpus = "1.15"
+num_cpus = "1.16"
 pacmanconf = "2.0"
 r2d2 = "0.8"
 rayon = "1.7"
-rust-embed = "6.6"
+rust-embed = "6.8"
 rustyline = "11"
 serde = "1.0"
 serde_json = "1.0"

rust/aura-pm/README.md

@@ -10,5 +10,5 @@ Since this crate is still in the Alpha phase, you'll need to specify the version
 yourself when installing it via `cargo`:
 
 ```
-cargo install aura-pm --version 4.0.0-alpha6
+cargo install aura-pm --version 4.0.0-alpha8
 ```

rust/aura-pm/src/command/aur.rs

@@ -256,7 +256,7 @@ pub(crate) fn pkgbuild(pkg: &str, clone_d: &Path) -> Result<(), Error> {
     let mut out = BufWriter::new(std::io::stdout());
 
     file.lines()
-        .filter_map(|line| line.ok())
+        .map_while(Result::ok)
         .try_for_each(|line| writeln!(out, "{}", line))
         .map_err(|_| Error::Stdout)?;
 

rust/aura-pm/src/command/log.rs

@@ -37,6 +37,7 @@ impl Nested for Error {
 impl Localised for Error {
     fn localise(&self, fll: &FluentLanguageLoader) -> String {
         match self {
+            #[allow(suspicious_double_ref_op)]
             Error::Search(s, _) => fl!(fll, "L-search-err", cmd = s.deref()),
             Error::View(_) => fl!(fll, "L-view-err"),
             Error::Info(_) => fl!(fll, "err-write"),