rwf2
/
Rocket
mirror of https://github.com/rwf2/Rocket.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use forked compiletest for latest nightly.

This commit is contained in:
Sergio Benitez 2016-12-16 15:14:11 -08:00
parent 2e25ce04dc
commit e2fcd75325
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codegen/Cargo.toml
View File

@ -11,4 +11,4 @@ rocket = { path = "../lib/" }
log = "^0.3"
[dev-dependencies]
compiletest_rs = "^0.2"
compiletest_rs = { git = "https://github.com/SergioBenitez/compiletest-rs" }

3
lib/src/rocket.rs
View File

@ -174,7 +174,7 @@ impl Rocket {
// Rust thinks `request` is still borrowed here, but it's
// obviously not (data has nothing to do with it), so we
// convince it to give us another mutable reference.
// TODO: Pay the cost to copy Request into UnsafeCell?
// FIXME: Pay the cost to copy Request into UnsafeCell?
let request: &'r mut Request = unsafe {
&mut *(request as *const Request as *mut Request)
};
@ -208,6 +208,7 @@ impl Rocket {
for route in matches {
// Retrieve and set the requests parameters.
info_!("Matched: {}", route);
// FIXME: Users should not be able to use this.
request.set_params(route);
// Dispatch the request to the handler.