CandyCorvid/gemini - Change ARXVO5XAQFZR3X6MXW525Z6WXUYUHRJUGTTNCEKKXRAKQQBG5ZXAC

Make connection generic on the network

Created by CandyCorvid on July 13, 2023

ARXVO5XAQFZR3X6MXW525Z6WXUYUHRJUGTTNCEKKXRAKQQBG5ZXAC

Dependencies

In channels

main

Change contents

Replacement in src/server.rs at line 1 [3.34]

B:BD[3.34] → [3.35:73]

use std::{net::TcpStream, sync::Arc};

[3.34]

[3.73]

use std::{
    io::{Read, Write},
    net::TcpStream,
    sync::Arc,
};

Replacement in src/server.rs at line 10 [3.34]

B:BD[3.161] → [3.161:227]

pub(crate) fn connect<V: Default + ServerCertVerifier + 'static>(

[3.161]

[3.227]

pub trait Network {
    type Error;
    type Connection: Read + Write;
    fn connect(url: &Url) -> Result<Self::Connection, Self::Error>;
}
pub struct TcpNetwork<V>(V, !);
impl<V: ServerCertVerifier + Default + 'static> Network for TcpNetwork<V> {
    type Error = !;
    type Connection = rustls::StreamOwned<ClientConnection, TcpStream>;
    fn connect(url: &Url) -> Result<Self::Connection, Self::Error> {
        Ok(connect::<V>(&url))
    }
}
fn connect<V: Default + ServerCertVerifier + 'static>(

Replacement in src/server.rs at line 33 [3.34]

B:BD[3.382] → [3.382:416]

        let cfg = tls_cfg::<V>();

[3.382]

[3.416]

        let cfg = tls_cfg(V::default());

Replacement in src/server.rs at line 56 [3.34]

B:BD[3.1114] → [3.1114:1201]

fn tls_cfg<V: Default + ServerCertVerifier + 'static>() -> Arc<rustls::ClientConfig> {

[3.1114]

[3.1201]

fn tls_cfg<V: ServerCertVerifier + 'static>(v: V) -> Arc<rustls::ClientConfig> {

Replacement in src/server.rs at line 63 [3.34]

B:BD[3.1442] → [3.1442:1529]

        cfg.dangerous()
            .set_certificate_verifier(Arc::new(V::default()));

[3.1442]

[3.1529]

        cfg.dangerous().set_certificate_verifier(Arc::new(v));

Deletion in src/media.rs at line 2 [2.459]
B:BD[2.492] → [2.492:506]
```
use url::Url;
```

Insertion in src/media.rs at line 68 [2.459]

[2.2096]

        // TODO make a macro that matches on e.g. `"pre":x => {}` and desugars to
        // the kind of slice below

Replacement in src/main.rs at line 1 [4.3665]
B:BD[4.3665] → [5.0:21]
```
#![feature(pattern)]
```
[4.3665]
[6.0]
```
#![feature(pattern, never_type, unwrap_infallible)]
```
Replacement in src/main.rs at line 7 [4.3665]
∅:D[3.6915] → [6.20:50]
B:BD[4.3712] → [6.20:50]
∅:D[6.50] → [4.3756:3767]
B:BD[4.3756] → [4.3756:3767]
B:BD[4.3767] → [2.4985:5039]
∅:D[7.80] → [4.3807:3827]
∅:D[6.105] → [4.3807:3827]
∅:D[2.5039] → [4.3807:3827]
B:BD[4.3807] → [4.3807:3827]
B:BD[4.3842] → [4.3842:3845]
```
use rustls::ClientConnection;
use std::{
    io::{BufReader, Read, Result as ioResult, Write},
    net::TcpStream,
};
```
[3.6915]
[4.3845]
```
use server::{Network, TcpNetwork};
use std::io::{BufReader, Read, Result as ioResult, Write};
```
Deletion in src/main.rs at line 24 [4.3665]
B:BD[4.3860] → [4.3860:3924]
```
type Stream = rustls::StreamOwned<ClientConnection, TcpStream>;
```

Replacement in src/main.rs at line 33 [4.3665]

B:BD[2.5178] → [2.5178:5223]

    while let Some(new_url) = run_url(url) {

[2.5178]

[2.5223]

    while let Some(new_url) = run_url::<TcpNetwork<danger::Naive>>(url) {

Replacement in src/main.rs at line 38 [4.3665]

B:BD[4.4124] → [2.5253:5291]

fn run_url(url: Url) -> Option<Url> {

[4.4124]

[2.5291]

fn run_url<N: Network>(url: Url) -> Option<Url>
where
    <N as Network>::Error: std::fmt::Debug,
{

Replacement in src/main.rs at line 43 [4.3665]
∅:D[2.5337] → [6.322:383]
∅:D[3.7019] → [6.322:383]
B:BD[4.4208] → [6.322:383]
```
    let mut stream = server::connect::<danger::Naive>(&url);
```
[2.5337]
[4.4244]
```
    let mut stream = N::connect(&url).expect("Failed to connect");
```

Replacement in src/main.rs at line 126 [4.3665]

B:BD[8.860] → [2.6085:6162]

fn read_response_header(stream: &mut Stream) -> ioResult<response::Header> {

[8.860]

[7.157]

fn read_response_header(mut stream: impl Read) -> ioResult<response::Header> {

Replacement in src/main.rs at line 139 [4.3665]

B:BD[4.4960] → [7.309:375]

    BufReader::new(&mut *stream).read_until(b"\r\n", &mut meta)?;

[4.4960]

[6.717]

    BufReader::new(stream).read_until(b"\r\n", &mut meta)?;

Replacement in src/io.rs at line 1 [3.9554]
B:BD[3.9554] → [7.376:414]
```
use std::io::{BufRead, Read, Result};
```
[3.9554]
[7.414]
```
use std::io::{Read, Result};
```