bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rollup merge of #18398 : aturon/lint-conventions-2

Browse source 
Conflicts:
	src/libcollections/slice.rs
	src/libcore/failure.rs
	src/libsyntax/parse/token.rs
	src/test/debuginfo/basic-types-mut-globals.rs
	src/test/debuginfo/simple-struct.rs
	src/test/debuginfo/trait-pointers.rs
This commit is contained in:
Alex Crichton 2014-10-30 09:02:07 -07:00
commit 00975e041d
179 changed files with 285 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libserialize/json.rs
View file

@ -12,7 +12,7 @@
// Copyright (c) 2011 Google Inc.
#![forbid(non_camel_case_types)]
#![allow(missing_doc)]
#![allow(missing_docs)]
/*!
JSON parsing and serialization