diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/ops/fetch.rs | 2 | ||||
| -rw-r--r-- | runtime/ops/io.rs | 4 | ||||
| -rw-r--r-- | runtime/ops/net.rs | 42 | ||||
| -rw-r--r-- | runtime/ops/tls.rs | 8 |
4 files changed, 28 insertions, 28 deletions
diff --git a/runtime/ops/fetch.rs b/runtime/ops/fetch.rs index 9ab86858d..3cb0c6c78 100644 --- a/runtime/ops/fetch.rs +++ b/runtime/ops/fetch.rs @@ -16,8 +16,8 @@ pub fn init( .unwrap() }); state.put::<HttpClientDefaults>(HttpClientDefaults { - ca_data, user_agent, + ca_data, }); } super::reg_json_sync(rt, "op_fetch", deno_fetch::op_fetch::<Permissions>); diff --git a/runtime/ops/io.rs b/runtime/ops/io.rs index 1260452b6..75076f716 100644 --- a/runtime/ops/io.rs +++ b/runtime/ops/io.rs @@ -140,14 +140,14 @@ fn get_stdio_stream( use nix::sys::termios; #[derive(Default)] -pub struct TTYMetadata { +pub struct TtyMetadata { #[cfg(unix)] pub mode: Option<termios::Termios>, } #[derive(Default)] pub struct FileMetadata { - pub tty: TTYMetadata, + pub tty: TtyMetadata, } #[derive(Debug)] diff --git a/runtime/ops/net.rs b/runtime/ops/net.rs index c501da96d..4d335c886 100644 --- a/runtime/ops/net.rs +++ b/runtime/ops/net.rs @@ -504,21 +504,21 @@ fn op_listen( #[serde(untagged)] enum DnsReturnRecord { A(String), - AAAA(String), - ANAME(String), - CNAME(String), - MX { + Aaaa(String), + Aname(String), + Cname(String), + Mx { preference: u16, exchange: String, }, - PTR(String), - SRV { + Ptr(String), + Srv { priority: u16, weight: u16, port: u16, target: String, }, - TXT(Vec<String>), + Txt(Vec<String>), } #[derive(Deserialize)] @@ -610,24 +610,24 @@ fn rdata_to_return_record( AAAA => r .as_aaaa() .map(ToString::to_string) - .map(DnsReturnRecord::AAAA), + .map(DnsReturnRecord::Aaaa), ANAME => r .as_aname() .map(ToString::to_string) - .map(DnsReturnRecord::ANAME), + .map(DnsReturnRecord::Aname), CNAME => r .as_cname() .map(ToString::to_string) - .map(DnsReturnRecord::CNAME), - MX => r.as_mx().map(|mx| DnsReturnRecord::MX { + .map(DnsReturnRecord::Cname), + MX => r.as_mx().map(|mx| DnsReturnRecord::Mx { preference: mx.preference(), exchange: mx.exchange().to_string(), }), PTR => r .as_ptr() .map(ToString::to_string) - .map(DnsReturnRecord::PTR), - SRV => r.as_srv().map(|srv| DnsReturnRecord::SRV { + .map(DnsReturnRecord::Ptr), + SRV => r.as_srv().map(|srv| DnsReturnRecord::Srv { priority: srv.priority(), weight: srv.weight(), port: srv.port(), @@ -641,7 +641,7 @@ fn rdata_to_return_record( bytes.iter().map(|&b| b as char).collect::<String>() }) .collect(); - DnsReturnRecord::TXT(texts) + DnsReturnRecord::Txt(texts) }), // TODO(magurotuna): Other record types are not supported _ => todo!(), @@ -674,21 +674,21 @@ mod tests { fn rdata_to_return_record_aaaa() { let func = rdata_to_return_record(RecordType::AAAA); let rdata = RData::AAAA(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1)); - assert_eq!(func(&rdata), Some(DnsReturnRecord::AAAA("::1".to_string()))); + assert_eq!(func(&rdata), Some(DnsReturnRecord::Aaaa("::1".to_string()))); } #[test] fn rdata_to_return_record_aname() { let func = rdata_to_return_record(RecordType::ANAME); let rdata = RData::ANAME(Name::new()); - assert_eq!(func(&rdata), Some(DnsReturnRecord::ANAME("".to_string()))); + assert_eq!(func(&rdata), Some(DnsReturnRecord::Aname("".to_string()))); } #[test] fn rdata_to_return_record_cname() { let func = rdata_to_return_record(RecordType::CNAME); let rdata = RData::CNAME(Name::new()); - assert_eq!(func(&rdata), Some(DnsReturnRecord::CNAME("".to_string()))); + assert_eq!(func(&rdata), Some(DnsReturnRecord::Cname("".to_string()))); } #[test] @@ -697,7 +697,7 @@ mod tests { let rdata = RData::MX(MX::new(10, Name::new())); assert_eq!( func(&rdata), - Some(DnsReturnRecord::MX { + Some(DnsReturnRecord::Mx { preference: 10, exchange: "".to_string() }) @@ -708,7 +708,7 @@ mod tests { fn rdata_to_return_record_ptr() { let func = rdata_to_return_record(RecordType::PTR); let rdata = RData::PTR(Name::new()); - assert_eq!(func(&rdata), Some(DnsReturnRecord::PTR("".to_string()))); + assert_eq!(func(&rdata), Some(DnsReturnRecord::Ptr("".to_string()))); } #[test] @@ -717,7 +717,7 @@ mod tests { let rdata = RData::SRV(SRV::new(1, 2, 3, Name::new())); assert_eq!( func(&rdata), - Some(DnsReturnRecord::SRV { + Some(DnsReturnRecord::Srv { priority: 1, weight: 2, port: 3, @@ -737,7 +737,7 @@ mod tests { ])); assert_eq!( func(&rdata), - Some(DnsReturnRecord::TXT(vec![ + Some(DnsReturnRecord::Txt(vec![ "foo".to_string(), "bar".to_string(), "£".to_string(), diff --git a/runtime/ops/tls.rs b/runtime/ops/tls.rs index 5104e49f8..52c9d322a 100644 --- a/runtime/ops/tls.rs +++ b/runtime/ops/tls.rs @@ -79,7 +79,7 @@ pub fn init(rt: &mut deno_core::JsRuntime) { #[derive(Deserialize)] #[serde(rename_all = "camelCase")] -pub struct ConnectTLSArgs { +pub struct ConnectTlsArgs { transport: String, hostname: String, port: u16, @@ -88,7 +88,7 @@ pub struct ConnectTLSArgs { #[derive(Deserialize)] #[serde(rename_all = "camelCase")] -struct StartTLSArgs { +struct StartTlsArgs { rid: ResourceId, cert_file: Option<String>, hostname: String, @@ -96,7 +96,7 @@ struct StartTLSArgs { async fn op_start_tls( state: Rc<RefCell<OpState>>, - args: StartTLSArgs, + args: StartTlsArgs, _zero_copy: BufVec, ) -> Result<Value, AnyError> { let rid = args.rid; @@ -166,7 +166,7 @@ async fn op_start_tls( async fn op_connect_tls( state: Rc<RefCell<OpState>>, - args: ConnectTLSArgs, + args: ConnectTlsArgs, _zero_copy: BufVec, ) -> Result<Value, AnyError> { { |