Skip to content
This repository has been archived by the owner on Jul 10, 2023. It is now read-only.

Commit

Permalink
Auto merge of #16 - pyfisch:ipaddr, r=Manishearth
Browse files Browse the repository at this point in the history
Add Ipv4Addr and Ipv6Addr for use in rust-url

Needed for servo/rust-url#135.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/heapsize/16)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Nov 15, 2015
2 parents e9bc1a5 + c7015d6 commit f0a146c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 1 addition & 2 deletions Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "heapsize"
version = "0.1.1"
version = "0.1.2"
authors = [ "The Servo Project Developers" ]
description = "Infrastructure for measuring the total runtime size of an object on the heap"
license = "MPL-2.0"
Expand All @@ -11,4 +11,3 @@ unstable = []

[dependencies]
libc = "0.1"

2 changes: 2 additions & 0 deletions src/lib.rs
Expand Up @@ -17,6 +17,7 @@ use std::collections::hash_state;
use std::hash::Hash;
use std::marker::PhantomData;
use std::mem::{size_of, transmute};
use std::net::{Ipv4Addr, Ipv6Addr};
use std::sync::Arc;
use std::rc::Rc;

Expand Down Expand Up @@ -258,4 +259,5 @@ macro_rules! known_heap_size(
known_heap_size!(0, u8, u16, u32, u64, usize);
known_heap_size!(0, i8, i16, i32, i64, isize);
known_heap_size!(0, bool, f32, f64);
known_heap_size!(0, Ipv4Addr, Ipv6Addr);
known_heap_size!(0, PhantomData<T>);

0 comments on commit f0a146c

Please sign in to comment.