Skip to content

Fix deprecated stuff so it builds again #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 24, 2015
Merged

Fix deprecated stuff so it builds again #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion macros/src/atom/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ pub fn expand_ns(cx: &mut ExtCtxt, sp: Span, tt: &[TokenTree]) -> Box<MacResult+
];

fn usage() -> String {
let ns_names: Vec<&'static str> = ALL_NS.slice_from(1).iter()
let ns_names: Vec<&'static str> = ALL_NS[1..].iter()
.map(|&(x, _)| x).collect();
format!("Usage: ns!(HTML), case-insensitive. \
Known namespaces: {}",
Expand Down
2 changes: 1 addition & 1 deletion shared/repr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ pub unsafe fn inline_orig_bytes<'a>(data: &'a u64) -> &'a [u8] {
match UnpackedAtom::from_packed(*data) {
Inline(len, _) => {
let src: &[u8] = mem::transmute(inline_atom_slice(data));
src.slice_to(len as usize)
&src[..(len as usize)]
}
_ => intrinsics::unreachable(),
}
Expand Down
2 changes: 1 addition & 1 deletion src/atom/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ impl Drop for Atom {
}
}

impl fmt::Show for Atom {
impl fmt::Debug for Atom {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let ty_str = unsafe {
match self.unpack() {
Expand Down