fix regexes for beta and nightly Rust versions

This commit is contained in:
Benjamin Fry 2020-09-15 11:22:07 -07:00
parent 13a3246f31
commit 3ead8b1779
5 changed files with 17 additions and 8 deletions

View File

@ -9,6 +9,7 @@ All notes should be prepended with the location of the change, e.g. `(proto)` or
### Changed
- (resolver) For all NxDomain and NoError/NoData responses, `ResolveErrorKind::NoRecordsFound` will be returned #1197
- (server) Support for lowercase DNSClass and RecordType fields in zonefiles (@zhanif3) #1186
- (resolver) Make EDNS optional for resolvers (@CtrlZvi) #1173
- (all) Fully support *ring* for all DNSSEC operations. #1145
@ -30,6 +31,12 @@ All notes should be prepended with the location of the change, e.g. `(proto)` or
### Added
- (proto) `xfer::dns_response::NegativeType` and `DnsResponse::negative_type` to classify negative response type #1197
- (proto) `DnsResponse::contains_answer` to determine if a response message has data related to the query #1197
- (proto) `RecordType::is_soa` and `RecordType::is_ns` to easily check for these types #1197
- (proto) `Message::all_sections` to allow iteration over all `Records` in all sections in a Message #1197
- (proto) `Message::take_queries` to remove from a Message without requiring clone #1197
- (proto) `DnsHandle::Error` associated type to support generic errors across trust-dns libraries #1197
- (resolver) Add support for tlsa RRs in trust_dns_resolver (@smutt) #1189
- (resolver) Support pointer ending label compression (@jacoblin1994) #1182
- (proto) Keep OS error information on `io::Error` (@brunowonka) #1163

View File

@ -28,6 +28,7 @@ TDNS_WORKSPACE_ROOT = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}"
TDNS_WITH_KCOV_ARGS = "--lib --bins --tests --examples"
CARGO_MAKE_CRATES_IO_TOKEN = { value = "--token=${CRATES_IO_TOKEN}", condition = { env_set = ["CRATES_IO_TOKEN"] } }
#RUST_BACKTRACE=1
##
## Installation tasks

View File

@ -109,10 +109,10 @@ where
let wait_for_start_until = Instant::now() + Duration::from_secs(60);
// Search strings for the ports used during testing
let udp_regex = Regex::new(r"listening for UDP on V4\(0\.0\.0\.0:(:?\d+)\)").unwrap();
let tcp_regex = Regex::new(r"listening for TCP on V4\(0\.0\.0\.0:(:?\d+)\)").unwrap();
let tls_regex = Regex::new(r"listening for TLS on V4\(0\.0\.0\.0:(:?\d+)\)").unwrap();
let https_regex = Regex::new(r"listening for HTTPS on V4\(0\.0\.0\.0:(:?\d+)\)").unwrap();
let udp_regex = Regex::new(r"listening for UDP on (?:V4\()?0\.0\.0\.0:(\d+)\)?").unwrap();
let tcp_regex = Regex::new(r"listening for TCP on (?:V4\()?0\.0\.0\.0:(\d+)\)?").unwrap();
let tls_regex = Regex::new(r"listening for TLS on (?:V4\()?0\.0\.0\.0:(\d+)\)?").unwrap();
let https_regex = Regex::new(r"listening for HTTPS on (?:V4\()?0\.0\.0\.0:(\d+)\)?").unwrap();
while Instant::now() < wait_for_start_until {
{
@ -156,7 +156,10 @@ where
stdout().flush().unwrap();
assert!(found);
println!("server started");
println!(
"Test server started. ports: udp {:?}, tcp {:?}, tls {:?}, https {:?}",
test_udp_port, test_tcp_port, test_tls_port, test_https_port
);
// spawn a thread to capture stdout
let succeeded_clone = succeeded.clone();

View File

@ -34,7 +34,7 @@ pub enum ResolveErrorKind {
/// No records were found for a query
#[error("no record found for {query}")]
NoRecordsFound {
/// The negative Response, TODO: remove this
/// The query for which no records were found.
query: Query,
/// If an SOA is present, then this is an authoritative response.
soa: Option<SOA>,

View File

@ -507,8 +507,6 @@ where
enum Records {
/// The records exists, a vec of rdata with ttl
Exists(Vec<(Record, u32)>),
// /// Records do not exist, ttl for negative caching
// NoData { ttl: Option<u32> },
/// Future lookup for recursive cname records
CnameChain {
next: Pin<Box<dyn Future<Output = Result<Lookup, ResolveError>> + Send>>,