🏡 index : ~doyle/bin.git

author jordan@doyle.la <jordan@doyle.la> 2020-07-23 14:28:55.0 +00:00:00
committer jordan@doyle.la <jordan@doyle.la> 2020-07-23 14:28:55.0 +00:00:00
commit
2bbab69e94e25ee2b027f3f116553dd9228e6812 [patch]
tree
c0aebc44af8ddba5c91f892c1400a45b8e4fcf7b
parent
4eb9049a1aff1a5889444b4803526d9a788aa346
download
2bbab69e94e25ee2b027f3f116553dd9228e6812.tar.gz

cargo fmt



Diff

 src/io.rs   |  9 ++++-----
 src/main.rs |  9 ++++++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/io.rs b/src/io.rs
index 156c3e0..588acbf 100644
--- a/src/io.rs
+++ b/src/io.rs
@@ -60,16 +60,15 @@ pub fn generate_id() -> String {
pub async fn store_paste(id: String, content: String) {
    purge_old().await;

    ENTRIES
        .write()
        .await
        .insert(id, content);
    ENTRIES.write().await.insert(id, content);
}

/// Get a paste by id.
///
/// Returns `None` if the paste doesn't exist.
pub async fn get_paste(id: &str) -> Option<RwLockReadGuardRef<'_, LinkedHashMap<String, String>, String>> {
pub async fn get_paste(
    id: &str,
) -> Option<RwLockReadGuardRef<'_, LinkedHashMap<String, String>, String>> {
    // need to box the guard until owning_ref understands Pin is a stable address
    let or = RwLockReadGuardRef::new(Box::new(ENTRIES.read().await));

diff --git a/src/main.rs b/src/main.rs
index c36cca6..4522fd0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -64,8 +64,11 @@ async fn submit(input: Form<IndexForm>) -> Redirect {
#[put("/", data = "<input>")]
async fn submit_raw(input: Data, host: HostHeader<'_>) -> Result<String, Status> {
    let mut data = String::new();
    input.open().take(1024 * 1000)
        .read_to_string(&mut data).await
    input
        .open()
        .take(1024 * 1000)
        .read_to_string(&mut data)
        .await
        .map_err(|_| Status::InternalServerError)?;

    let id = generate_id();
@@ -108,7 +111,7 @@ async fn show_paste(key: String, plaintext: IsPlaintextRequest) -> Result<Conten
            None => String::from(RawStr::from_str(entry).html_escape()),
        };

        // Add <code> tags to enable line numbering with CSS 
        // Add <code> tags to enable line numbering with CSS
        let html = format!(
            "<code>{}</code>",
            code_highlighted.replace("\n", "\n</code><code>")