Authentication-Results: mail-b.sr.ht; dkim=pass header.d=alyssa.is header.i=@alyssa.is; dkim=pass header.d=messagingengine.com header.i=@messagingengine.com Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by mail-b.sr.ht (Postfix) with ESMTPS id E7DAC11EF92 for <~qaul/community@lists.sr.ht>; Tue, 2 Mar 2021 14:23:05 +0000 (UTC) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id B4CA25C0117; Tue, 2 Mar 2021 09:23:05 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Tue, 02 Mar 2021 09:23:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=fm2; bh=hU1MQMG4VANJzSelg9DMen6BGK TF2p0AyADoT2gHae4=; b=bgYOCYbHcCp67MpgjE69zx0cmCLpgbgwhghgNM7ZEQ KBuC0eBNgeHg6N6YUv5IvWOYdpt3rP0zJG5OmD5uusVI3pS9NHk2OvreDRMfGW8B UZwtQUbl4nSDpxVcj8sYj/xjwykTfibOcJqs80DaFSAKfKaCc0xMI2255kh/3a/a 3H1fCvGyy6VvTe/NUQc6MJIOdyiYU0K1I8SbfpTNBGTqU490+Zwyzd36dGunFWTI 68ja51T45DMHvsKUT1/mgIwF0fzDHlNa3FkIeO6C26wO686I8QGuaGcWRmjg7EdV 0soVE67+I0owI+w+p1XxRmsE5gUnwNoaC0j7AwKRaaUA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=hU1MQMG4VANJzSelg 9DMen6BGKTF2p0AyADoT2gHae4=; b=rDtXrP2My1gCGp01twMyxE+zeyKHNAj3U bYSP1swEaBKMMUTBRiyI9kzqKC9Pp8SBeKOza/sX6I0SqYN8czoBdBfUPOZUoxij gU7Dql8526/jbw9zL/v6JcY4PPdMhhwDncoUr0D0W5BbqQA0G8AxWn36/UMvhFrG FqAps4WZwa075SBvewgFr+ikT9tG4wdBYelujuwgMiyBXN8r/yPUf6cu40wS2tHa Jp+mPpP0dWm2pD18dtsvfRqQTVukGy/+Akn27W+9Lpr/29wrttnTVGecGRHOO0ZU oMeyztPPVQIxMqVgupr2Ojl3a7Xh2CX/kV9Md9fEBs7spQu7cMsZg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledruddttddgieefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomheptehlhihsshgrucftohhsshcuoehhihesrghlhihsshgrrdhisheq necuggftrfgrthhtvghrnhepteejjeelleehueevieefteegudegvdffffetfeelgeejue effeeuvddvtdfhieffnecuffhomhgrihhnpehprghthhdrsghuihhlugenucfkphepjeel rddvfeehrdduvddvrddugeehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpe hmrghilhhfrhhomhepqhihlhhishhssegvvhgvrdhqhihlihhsshdrnhgvth X-ME-Proxy: Received: from eve.qyliss.net (p4feb7a91.dip0.t-ipconnect.de [79.235.122.145]) by mail.messagingengine.com (Postfix) with ESMTPA id D71D61080057; Tue, 2 Mar 2021 09:23:04 -0500 (EST) Received: by eve.qyliss.net (Postfix, from userid 1000) id C764AFA6; Tue, 2 Mar 2021 14:23:02 +0000 (UTC) From: Alyssa Ross To: ~qaul/community@lists.sr.ht Cc: Katharina Fey Subject: [PATCH] alexandria: fix tests that were broken by rename Date: Tue, 2 Mar 2021 14:22:59 +0000 Message-Id: <20210302142259.4688-1-hi@alyssa.is> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit --- This was causing CI to fail. utils/alexandria/src/core/api.rs | 8 ++++---- utils/alexandria/src/core/builder.rs | 2 +- utils/alexandria/src/utils/path.rs | 4 ++-- utils/alexandria/tests/harness.rs | 2 +- utils/alexandria/tests/trivial.rs | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/utils/alexandria/src/core/api.rs b/utils/alexandria/src/core/api.rs index c5afd684..14bcc851 100644 --- a/utils/alexandria/src/core/api.rs +++ b/utils/alexandria/src/core/api.rs @@ -187,7 +187,7 @@ impl Library { /// will only return a single record if successful. /// /// ``` - /// # use alexandria::{Builder, GLOBAL, Library, error::Result, utils::{Tag, TagSet, Path}, query::Query}; + /// # use alexandria2::{Builder, GLOBAL, Library, error::Result, utils::{Tag, TagSet, Path}, query::Query}; /// # async fn foo() -> Result<()> { /// # let tmp = tempfile::tempdir().unwrap(); /// # let lib = Builder::new().offset(tmp.path()).build().unwrap(); @@ -213,7 +213,7 @@ impl Library { /// Following are a few examples for tag queries. /// /// ``` - /// # use alexandria::{GLOBAL, Builder, Library, error::Result, utils::{Tag, TagSet, Path}, query::Query}; + /// # use alexandria2::{GLOBAL, Builder, Library, error::Result, utils::{Tag, TagSet, Path}, query::Query}; /// # async fn foo() -> Result<()> { /// # let tmp = tempfile::tempdir().unwrap(); /// # let lib = Builder::new().offset(tmp.path()).build().unwrap(); @@ -275,7 +275,7 @@ impl Library { /// of the `query()` usage quite closely. /// /// ``` - /// # use alexandria::{GLOBAL, Builder, Library, error::Result, utils::{Tag, TagSet, Path}, query::Query}; + /// # use alexandria2::{GLOBAL, Builder, Library, error::Result, utils::{Tag, TagSet, Path}, query::Query}; /// # async fn foo() -> Result<()> { /// # let tmp = tempfile::tempdir().unwrap(); /// # let lib = Builder::new().offset(tmp.path()).build().unwrap(); @@ -357,7 +357,7 @@ impl Library { /// into the database to get an updated set of data. /// /// ``` - /// # use alexandria::{GLOBAL, Builder, Library, error::Result, utils::{Tag, TagSet, Path}, query::{Query, SetQuery}}; + /// # use alexandria2::{GLOBAL, Builder, Library, error::Result, utils::{Tag, TagSet, Path}, query::{Query, SetQuery}}; /// # async fn foo() -> Result<()> { /// # let tmp = tempfile::tempdir().unwrap(); /// # let lib = Builder::new().offset(tmp.path()).build().unwrap(); diff --git a/utils/alexandria/src/core/builder.rs b/utils/alexandria/src/core/builder.rs index 168f87f4..d6855690 100644 --- a/utils/alexandria/src/core/builder.rs +++ b/utils/alexandria/src/core/builder.rs @@ -16,7 +16,7 @@ use std::{path::Path, result::Result as StdResult}; /// [load]: struct.Library.html#load /// /// ``` -/// # use alexandria::{Builder, Library, error::Result}; +/// # use alexandria2::{Builder, Library, error::Result}; /// # use tempfile::tempdir; /// # fn test() -> Result<()> { /// let dir = tempdir().unwrap(); diff --git a/utils/alexandria/src/utils/path.rs b/utils/alexandria/src/utils/path.rs index 61a7f971..6cc4be78 100644 --- a/utils/alexandria/src/utils/path.rs +++ b/utils/alexandria/src/utils/path.rs @@ -27,7 +27,7 @@ use std::fmt::{self, Display, Formatter}; /// strings: /// /// ```rust -/// # use alexandria::utils::Path; +/// # use alexandria2::utils::Path; /// let _: Path = "/test:data".into(); /// ``` /// @@ -38,7 +38,7 @@ use std::fmt::{self, Display, Formatter}; /// `mkPath!` macro in the same module. /// /// ```rust,ignore -/// # use alexandria::path::mkPath; +/// # use alexandria2::path::mkPath; /// let _: Path = mkPath!("imgs", "bob", "cool"); /// ``` /// diff --git a/utils/alexandria/tests/harness.rs b/utils/alexandria/tests/harness.rs index a722b8e2..a4d28e54 100644 --- a/utils/alexandria/tests/harness.rs +++ b/utils/alexandria/tests/harness.rs @@ -1,6 +1,6 @@ //! A test harness for alexandria tests -use alexandria::{utils::Id, Builder, Library, Session}; +use alexandria2::{utils::Id, Builder, Library, Session}; use async_std::{sync::Arc, task::block_on}; use std::path::PathBuf; diff --git a/utils/alexandria/tests/trivial.rs b/utils/alexandria/tests/trivial.rs index dd4299f7..9ff9b276 100644 --- a/utils/alexandria/tests/trivial.rs +++ b/utils/alexandria/tests/trivial.rs @@ -10,7 +10,7 @@ mod harness; use harness::Test; -use alexandria::{ +use alexandria2::{ query::{Query, QueryResult}, record::kv::Value, utils::{Diff, DiffSeg, Path, Tag, TagSet}, -- 2.30.0